Merge "Merge Android 12"
diff --git a/Android.bp b/Android.bp
index bea02f5..2003849 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,7 +20,8 @@
 
 java_defaults {
     name: "CellBroadcastCommon",
-    min_sdk_version: "29",
+    min_sdk_version: "30",
+    target_sdk_version: "31",
     sdk_version: "module_current",
     privileged: true,
     srcs: [
@@ -39,12 +40,19 @@
         "androidx.preference_preference",
         "androidx.appcompat_appcompat",
         "androidx.legacy_legacy-preference-v14",
+        "SettingsLibSettingsTheme",
+        "SettingsLibCollapsingToolbarBaseActivity",
+        "SettingsLibMainSwitchPreference",
+        "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 71accbf..00fa2a4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,25 +21,41 @@
         android:versionCode="300000000"
         android:versionName="R-initial">
 
-    <original-package android:name="com.android.cellbroadcastreceiver" />
+    <!-- Needed for TTS when targetSdkVersion is 30 -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </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.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" />
     <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
     <uses-permission android:name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
-    <uses-sdk android:minSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="30" />
 
     <application android:name="com.android.cellbroadcastreceiver.CellBroadcastReceiverApp"
             android:label="@string/app_label"
@@ -72,7 +88,9 @@
 
         <activity android:name="com.android.cellbroadcastreceiver.CellBroadcastListActivity"
                   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" />
@@ -104,15 +122,16 @@
         <!-- Settings opened by ListActivity menu, Settings app link or opt-out dialog. -->
         <activity android:name="com.android.cellbroadcastreceiver.CellBroadcastSettings"
                   android:theme="@style/CellBroadcastSettingsTheme"
+                  android:launchMode="singleTask"
                   android:label="@string/sms_cb_settings"
                   android:exported="true" />
 
         <activity android:name="com.android.cellbroadcastreceiver.CellBroadcastAlertDialog"
                   android:theme="@style/CellBroadcastAlertTheme"
-                  android:launchMode="singleTask"
+                  android:launchMode="singleInstance"
                   android:exported="false"
                   android:excludeFromRecents="true"
-                  android:configChanges="orientation|keyboardHidden|keyboard|navigation">
+                  android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation">
             <intent-filter>
                 <action android:name="android.provider.Telephony.SMS_CB_RECEIVED" />
             </intent-filter>
@@ -120,9 +139,12 @@
 
         <!-- Container activity for CMAS opt-in/opt-out dialog. -->
         <activity android:name="com.android.cellbroadcastreceiver.CellBroadcastOptOutActivity"
+                  android:launchMode="singleInstance"
+                  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" />
@@ -132,6 +154,8 @@
                 <action android:name="android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED" />
                 <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 d9463ee..4e2992b 100644
--- a/AndroidManifest_Platform.xml
+++ b/AndroidManifest_Platform.xml
@@ -21,10 +21,12 @@
 
   <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.VIBRATE" />
   <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
@@ -35,6 +37,9 @@
   <uses-permission android:name="android.permission.READ_SMS" />
   <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
   <uses-permission android:name="com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY" />
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+  <uses-permission android:name="android.permission.BLUETOOTH" />
+  <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
 
   <uses-sdk android:minSdkVersion="21"/>
 
@@ -67,7 +72,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" />
@@ -103,11 +109,11 @@
         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"
-        android:configChanges="orientation|keyboardHidden|keyboard|navigation">
+        android:configChanges="orientation|keyboardHidden|screenSize|keyboard|navigation">
       <intent-filter>
         <action android:name="android.provider.Telephony.SMS_CB_RECEIVED" />
       </intent-filter>
@@ -117,7 +123,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" />
@@ -127,6 +134,8 @@
         <action android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" />
         <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/RROSampleTestApp/AndroidManifest.xml b/RROSampleTestApp/AndroidManifest.xml
index fe5b4ae..b3bb97f 100644
--- a/RROSampleTestApp/AndroidManifest.xml
+++ b/RROSampleTestApp/AndroidManifest.xml
@@ -16,7 +16,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.cellbroadcast.overlay">
     <application android:hasCode="false" />
-    <uses-sdk android:targetSdkVersion="29" />
+    <!-- change targetPackage name to override mainlined cellbroadcast module -->
     <overlay android:targetPackage="com.android.cellbroadcastreceiver"
-        android:targetName="CellBroadcastCustomization"/>
-</manifest>
\ No newline at end of file
+        android:targetName="CellBroadcastCustomization"
+        android:isStatic="true"
+        android:priority="0"/>
+</manifest>
diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml
index 1f1f741..8bcdef6 100644
--- a/apex/AndroidManifest.xml
+++ b/apex/AndroidManifest.xml
@@ -20,9 +20,5 @@
     <application android:hasCode="false" />
     <!-- 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:maxSdkVersion="30"
-        android:targetSdkVersion="30"
-    />
-    -->
+    <uses-sdk android:targetSdkVersion="31" />
 </manifest>
diff --git a/apex/apex_manifest.json b/apex/apex_manifest.json
index c936474..95facfa 100644
--- a/apex/apex_manifest.json
+++ b/apex/apex_manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.cellbroadcast",
-  "version": 300000000
-}
\ No newline at end of file
+  "version": 319999900
+}
diff --git a/legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java b/legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java
index 758cec0..493d20d 100644
--- a/legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java
+++ b/legacy/src/com/android/cellbroadcastreceiver/LegacyCellBroadcastContentProvider.java
@@ -22,6 +22,8 @@
 public class LegacyCellBroadcastContentProvider extends ContentProvider {
     // shared preference under developer settings
     private static final String ENABLE_ALERT_MASTER_PREF = "enable_alerts_master_toggle";
+    // shared preference for alert reminder interval
+    private static final String ALERT_REMINDER_INTERVAL_PREF = "alert_reminder_interval";
 
     private static final String TAG = LegacyCellBroadcastContentProvider.class.getSimpleName();
     /** A list of preference supported by legacy app **/
@@ -37,7 +39,8 @@
             CellBroadcasts.Preference.ENABLE_EMERGENCY_PERF,
             CellBroadcasts.Preference.ENABLE_ALERT_VIBRATION_PREF,
             CellBroadcasts.Preference.ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF,
-            ENABLE_ALERT_MASTER_PREF
+            ENABLE_ALERT_MASTER_PREF,
+            ALERT_REMINDER_INTERVAL_PREF
     );
 
     /** The database for this content provider. */
@@ -79,7 +82,11 @@
                 // if preference value does not exists, return null.
                 if (sp != null && sp.contains(name)) {
                     Bundle result = new Bundle();
-                    result.putBoolean(name, sp.getBoolean(name, true));
+                    if (ALERT_REMINDER_INTERVAL_PREF.equals(name)) {
+                        result.putString(name, sp.getString(name, "0"));
+                    } else {
+                        result.putBoolean(name, sp.getBoolean(name, true));
+                    }
                     Log.d(TAG, "migrate sharedpreference: " + name + " val: " + result.get(name));
                     return result;
                 }
diff --git a/res/drawable/ic_delete_24dp.xml b/res/drawable/ic_delete_24dp.xml
new file mode 100644
index 0000000..3f83bc4
--- /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 0000000..1de4f9f
--- /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/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_info_outline_24dp.xml
new file mode 100644
index 0000000..b1bec7e
--- /dev/null
+++ b/res/drawable/ic_info_outline_24dp.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24"
+        android:tint="?android:attr/textColorSecondary">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,7h2v2h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,11h2v6h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-4.41 3.59,-8 8,-8s8,3.59 8,8C20,16.41 16.41,20 12,20z"/>
+</vector>
diff --git a/res/drawable/ic_settings_gear_outline_24dp.xml b/res/drawable/ic_settings_gear_outline_24dp.xml
new file mode 100644
index 0000000..ddd8b82
--- /dev/null
+++ b/res/drawable/ic_settings_gear_outline_24dp.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M13.85 22.25l-3.7 0C9.41 22.25 8.79 21.71 8.7 20.98L8.43 19.09C8.16 18.95 7.9 18.8 7.64 18.63l-1.8 0.72C5.14 19.61 4.37 19.32 4.03 18.7L2.2 15.53C1.85 14.87 2 14.09 2.56 13.65L4.09 12.46C4.08 12.31 4.07 12.16 4.07 12c0 -0.15 0.01 -0.31 0.02 -0.46L2.57 10.35C1.98 9.9 1.83 9.09 2.2 8.47L4.05 5.28C4.39 4.66 5.16 4.38 5.84 4.65L7.65 5.38C7.91 5.21 8.17 5.06 8.43 4.92L8.7 3.01C8.79 2.31 9.41 1.76 10.14 1.76l3.7 0c0.74 0 1.36 0.54 1.45 1.27l0.27 1.89c0.27 0.14 0.53 0.29 0.79 0.46l1.8 -0.72c0.71 -0.26 1.48 0.03 1.82 0.65l1.84 3.18c0.36 0.66 0.2 1.44 -0.36 1.88l-1.52 1.19c0.01 0.15 0.02 0.3 0.02 0.46 0 0.16 -0.01 0.31 -0.02 0.46l1.52 1.19c0.56 0.45 0.72 1.23 0.37 1.86l-1.86 3.22c-0.34 0.62 -1.11 0.9 -1.8 0.63l-1.8 -0.72c-0.26 0.17 -0.52 0.32 -0.78 0.46l-0.27 1.91c-0.1 0.68 -0.72 1.22 -1.46 1.22zm-0.53 -1.53c0 0.01 0 0.01 0 0.02l0 -0.02zm-2.64 -0.02l0 0.02c0.01 0 0.01 -0.01 0 -0.02zm-0.06 -0.45l2.76 0 0.37 -2.55 0.53 -0.22c0.44 -0.18 0.88 -0.44 1.34 -0.78l0.45 -0.34 2.38 0.96 1.38 -2.4 -2.03 -1.58 0.07 -0.56c0.03 -0.26 0.06 -0.51 0.06 -0.78 0 -0.27 -0.03 -0.53 -0.06 -0.78L17.8 10.66 19.83 9.08 18.44 6.68 16.05 7.64 15.6 7.29C15.18 6.97 14.73 6.71 14.27 6.52L13.75 6.3 13.38 3.75 10.62 3.75 10.25 6.3 9.72 6.51C9.28 6.7 8.84 6.95 8.38 7.3L7.93 7.63 5.55 6.68 4.16 9.07 6.19 10.65 6.12 11.21C6.09 11.47 6.06 11.74 6.06 12c0 0.26 0.02 0.53 0.06 0.78l0.07 0.56 -2.03 1.58 1.38 2.4 2.39 -0.96 0.45 0.35c0.43 0.33 0.86 0.58 1.33 0.77l0.53 0.22 0.38 2.55zm7.6 -2.53c0 0.01 -0.01 0.02 -0.01 0.03l0.01 -0.03zM5.77 17.71L5.78 17.73c0 -0.01 -0.01 -0.02 -0.01 -0.02zm-1.84 -8.24l0 0c0 0 0 0 0 0zm14.29 -3.2c0 0.01 0.01 0.02 0.01 0.02L18.22 6.27ZM5.79 6.25L5.78 6.27c0 0 0.01 -0.01 0.01 -0.02zm7.52 -2.97c0 0.01 0 0.01 0 0.02l0 -0.02zm-2.62 -0.02l0 0.02c0 -0.01 0 -0.01 0 -0.02z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M15.5 12A3.5 3.5 0 0 1 12 15.5 3.5 3.5 0 0 1 8.5 12 3.5 3.5 0 0 1 12 8.5 3.5 3.5 0 0 1 15.5 12Z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/res/layout/cell_broadcast_alert.xml b/res/layout/cell_broadcast_alert.xml
index 069213c..bff3c7b 100644
--- a/res/layout/cell_broadcast_alert.xml
+++ b/res/layout/cell_broadcast_alert.xml
@@ -20,14 +20,14 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/parentPanel"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="8dip"
     android:layout_marginEnd="8dip"
     android:orientation="vertical">
 
     <LinearLayout android:id="@+id/topPanel"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical">
         <View android:id="@+id/titleDividerTop"
@@ -36,7 +36,7 @@
             android:visibility="gone"
             android:background="@android:color/holo_blue_light" />
         <LinearLayout android:id="@+id/title_template"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:gravity="center_vertical|start"
@@ -52,7 +52,7 @@
                 style="?android:attr/windowTitleStyle"
                 android:singleLine="true"
                 android:ellipsize="end"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
         </LinearLayout>
         <View android:id="@+id/titleDivider"
@@ -63,29 +63,29 @@
     </LinearLayout>
 
     <LinearLayout android:id="@+id/contentPanel"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="vertical">
-        <ScrollView android:id="@+id/scrollView"
-            android:layout_width="match_parent"
+        <com.android.cellbroadcastreceiver.CustomHeightScrollView android:id="@+id/scrollView"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fillViewport="true"
             android:clipToPadding="false">
             <TextView android:id="@+id/message"
                 style="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingStart="16dip"
                 android:paddingEnd="16dip"
                 android:paddingTop="8dip"
                 android:paddingBottom="8dip"
                 android:longClickable="true" />
-        </ScrollView>
+        </com.android.cellbroadcastreceiver.CustomHeightScrollView>
     </LinearLayout>
 
     <LinearLayout android:id="@+id/pictogramPanel"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:orientation="vertical">
@@ -113,11 +113,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:gravity="end"
+            android:gravity="center_horizontal"
             android:measureWithLargestChild="true">
             <Button android:id="@+id/dismissButton"
                 android:layout_width="wrap_content"
                 android:layout_weight="0"
+                android:paddingLeft="100dp"
+                android:paddingRight="100dp"
                 android:maxLines="2"
                 style="?android:attr/buttonBarButtonStyle"
                 android:text="@string/button_dismiss"
diff --git a/res/layout/cell_broadcast_list_collapsing_no_toobar.xml b/res/layout/cell_broadcast_list_collapsing_no_toobar.xml
new file mode 100644
index 0000000..8f397aa
--- /dev/null
+++ b/res/layout/cell_broadcast_list_collapsing_no_toobar.xml
@@ -0,0 +1,30 @@
+<?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.
+-->
+<!-- The main content view -->
+<LinearLayout
+    android:id="@+id/content_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:transitionGroup="true"
+    android:orientation="vertical">
+    <FrameLayout
+        android:id="@+id/content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/res/layout/cell_broadcast_list_item.xml b/res/layout/cell_broadcast_list_item.xml
index ca2c383..811a9cf 100644
--- a/res/layout/cell_broadcast_list_item.xml
+++ b/res/layout/cell_broadcast_list_item.xml
@@ -44,7 +44,8 @@
     <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/textAppearanceSmall"
         android:singleLine="true"
@@ -54,10 +55,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/channel"
+        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 80d43ec..c895e5f 100644
--- a/res/layout/cell_broadcast_list_screen.xml
+++ b/res/layout/cell_broadcast_list_screen.xml
@@ -26,6 +26,8 @@
                 android:layout_height="match_parent"
                 android:drawSelectorOnTop="false"
                 android:scrollbarStyle="insideOverlay"
+                android:divider="@null"
+                android:dividerHeight="0dp"
                 />
 
         <TextView android:id="@+id/empty"
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
new file mode 100644
index 0000000..741435e
--- /dev/null
+++ b/res/layout/preference_category_material_settings.xml
@@ -0,0 +1,66 @@
+<?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.
+  -->
+
+<!-- Based off frameworks/base/core/res/res/layout/preference_category_material.xml
+     except that this supports icon -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart" >
+
+    <LinearLayout
+        android:id="@+id/icon_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="start|center_vertical"
+        android:orientation="horizontal">
+        <com.android.internal.widget.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:tint="?android:attr/textColorPrimary"
+            android:maxWidth="18dp"
+            android:maxHeight="18dp"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="56dp"
+        android:orientation="vertical">
+        <TextView
+            android:id="@android:id/title"
+            android:layout_marginTop="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="@android:style/TextAppearance.Material.Body2"
+            android:textColor="?android:attr/colorAccent"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"/>
+        <TextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:ellipsize="end"
+            android:singleLine="true" />
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
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 0000000..1afd5f2
--- /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/mipmap-anydpi-v26/ic_launcher_cell_broadcast.xml b/res/mipmap-anydpi-v26/ic_launcher_cell_broadcast.xml
new file mode 100644
index 0000000..fc33b1f
--- /dev/null
+++ b/res/mipmap-anydpi-v26/ic_launcher_cell_broadcast.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_cell_broadcast_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_cell_broadcast_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/res/mipmap-hdpi/ic_launcher_cell_broadcast.png b/res/mipmap-hdpi/ic_launcher_cell_broadcast.png
index 274ba81..4dc6276 100644
--- a/res/mipmap-hdpi/ic_launcher_cell_broadcast.png
+++ b/res/mipmap-hdpi/ic_launcher_cell_broadcast.png
Binary files differ
diff --git a/res/mipmap-hdpi/ic_launcher_cell_broadcast_foreground.png b/res/mipmap-hdpi/ic_launcher_cell_broadcast_foreground.png
new file mode 100644
index 0000000..f90096f
--- /dev/null
+++ b/res/mipmap-hdpi/ic_launcher_cell_broadcast_foreground.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_cell_broadcast.png b/res/mipmap-mdpi/ic_launcher_cell_broadcast.png
index 299f40b..e308692 100644
--- a/res/mipmap-mdpi/ic_launcher_cell_broadcast.png
+++ b/res/mipmap-mdpi/ic_launcher_cell_broadcast.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_cell_broadcast_foreground.png b/res/mipmap-mdpi/ic_launcher_cell_broadcast_foreground.png
new file mode 100644
index 0000000..8f132d3
--- /dev/null
+++ b/res/mipmap-mdpi/ic_launcher_cell_broadcast_foreground.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_cell_broadcast.png b/res/mipmap-xhdpi/ic_launcher_cell_broadcast.png
index 59fbc30..e0d7f4a 100644
--- a/res/mipmap-xhdpi/ic_launcher_cell_broadcast.png
+++ b/res/mipmap-xhdpi/ic_launcher_cell_broadcast.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_cell_broadcast_foreground.png b/res/mipmap-xhdpi/ic_launcher_cell_broadcast_foreground.png
new file mode 100644
index 0000000..5d427da
--- /dev/null
+++ b/res/mipmap-xhdpi/ic_launcher_cell_broadcast_foreground.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_cell_broadcast.png b/res/mipmap-xxhdpi/ic_launcher_cell_broadcast.png
index 98f4e32..db88ee5 100644
--- a/res/mipmap-xxhdpi/ic_launcher_cell_broadcast.png
+++ b/res/mipmap-xxhdpi/ic_launcher_cell_broadcast.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_cell_broadcast_foreground.png b/res/mipmap-xxhdpi/ic_launcher_cell_broadcast_foreground.png
new file mode 100644
index 0000000..14ede7b
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_cell_broadcast_foreground.png
Binary files differ
diff --git a/res/raw/info.ogg b/res/raw/info.ogg
deleted file mode 100644
index fe30137..0000000
--- a/res/raw/info.ogg
+++ /dev/null
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 11127a1..5c14683 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Draadlose noodwaarskuwings"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Draadlose noodwaarskuwings"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Draadlose noodwaarskuwings"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Draadlose noodwaarskuwings"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Draadlose noodwaarskuwings"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Inligtingkennisgewing"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Draadlose noodwaarskuwing-instellings is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Geen vorige waarskuwings nie"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Instellings"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Vee uitsendings uit"</string>
     <string name="message_options" msgid="3178489901903589574">"Boodskapopsies"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Bekyk details"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Waarskuwings"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Uitsaaiboodskappe"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Noodwaarskuwings"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Onerkende noodwaarskuwings"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Noodwaarskuwings in stemoproep"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Outomatiese WEA-instellingsveranderinge op grond van SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Laat waarskuwings toe"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Ontvang draadlose noodwaarskuwings"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Waarskuwingonthounota"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Sê waarskuwingboodskap hardop"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Gebruik teks-na-spraak om \'n draadlose noodwaarskuwingboodskap hardop te sê"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"\'n Onthounotaklank sal op gewone volume speel"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Noodwaarskuwinggeskiedenis"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Waarskuwingvoorkeure"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Waarsku oor lewensgevaarlike gebeurtenisse"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Toetswaarskuwings"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Ontvang diensverskaffertoetse en maandelikse toetse van die veiligheidwaarskuwingstelsel af"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Ontvang noodberig: Oefening-/drilboodskap"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Ontvang noodberig: Operateur is gedefinieer"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrasie"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Waarsku altyd op hardste volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignoreer Moenie Steur nie en ander volume-instellings"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area-opdateringuitsendings"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimum wagtyd:"</string>
     <string name="seconds" msgid="141450721520515025">"sekondes"</string>
     <string name="message_copied" msgid="6922953753733166675">"Boodskap is gekopieer"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Instellings is deur diensverskaffer verander"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tik om draadlose noodwaarskuwinginstellings te sien"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index aa44169..2190aa8 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"ቅንብሮች"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ስርጭት ሰርዝ"</string>
     <string name="message_options" msgid="3178489901903589574">"የመልዕክት አማራጮች"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"ዝርዝሮችን ይመልከቱ"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"የአካባቢ ዝማኔ ስርጭቶች"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b81f4a1..3bd1803 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"الإعدادات"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"حذف مجموعات البث"</string>
     <string name="message_options" msgid="3178489901903589574">"خيارات الرسائل"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"عرض التفاصيل"</string>
@@ -52,10 +57,14 @@
     <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 التلقائي بناءً على شريحة 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">"استخدام ميزة \"تحويل النص إلى كلام\" للاستماع إلى رسائل إنذارات الطوارئ اللاسلكية"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"عمليات بث معلومات التحديث المتعلقة بالمنطقة"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 815fc94..24879a1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"ছেটিংসমূহ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"সম্প্ৰচাৰসমূহ মচক"</string>
     <string name="message_options" msgid="3178489901903589574">"বাৰ্তাৰ বিকল্পসমূহ"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"সবিশেষ চাওক"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"এলেকা আপডে’ট সম্প্ৰচাৰসমূহ"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 50fa2ec..12abe66 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <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>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Keçmiş siqnal yoxdur"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Ayarlar"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Yayımı silin"</string>
     <string name="message_options" msgid="3178489901903589574">"Mesaj seçimləri"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Detallara baxın"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Siqnallar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Yayım mesajları"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Həyəcan siqnalı"</string>
+    <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">"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">"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>
@@ -77,7 +86,14 @@
     <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">"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>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Fövqəladə hal siqnalı alın: Operator tərəfindən ntəyin edilən"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrasiya"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Həmişə tam səs ilə siqnal səslənsin"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"\"Narahat Etməyin\" və digər səs ayarlarını nəzərə almayın"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Ərazi yeniləmə yayımı"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimum gözləmə vaxtı:"</string>
     <string name="seconds" msgid="141450721520515025">"saniyə"</string>
     <string name="message_copied" msgid="6922953753733166675">"Mesaj kopyalandı"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Ayarlar operator tərəfindən dəyişdirilib"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Simsiz fövqəladə siqnal ayarlarına baxmaq üçün toxunun"</string>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 117f562..bc03573 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Bežična obaveštenja o hitnim slučajevima"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Bežična obaveštenja o hitnim slučajevima"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Bežična upozorenja o hitnim slučajevima"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Bežična upozorenja o hitnim slučajevima"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Bežična upozorenja o hitnim slučajevima"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informativno obaveštenje"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Podešavanja bežičnih obaveštenja o hitnim slučajevima nisu dostupna za ovog korisnika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Potvrdi"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nema prethodnih obaveštenja"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Podešavanja"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Izbriši emitovanja"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcije poruka"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Prikaži detalje"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Obaveštenja"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Poruke o emitovanju"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Hitna obaveštenja"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nepotvrđena obaveštenja o hitnim slučajevima"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Obaveštenja u hitnim slučajevima tokom glasovnog poziva"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatske promene podešavanja bežičnih upozorenja o hitnim slučajevima na osnovu SIM-a"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Dozvoli obaveštenja"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Šalji mi bežična obaveštenja o hitnim slučajevima"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Podsetnik za obaveštenja"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovori poruku obaveštenja"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Koristi pretvaranje teksta u govor za izgovaranje poruka bežičnih obaveštenja o hitnim slučajevima"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Zvuk podsetnika će biti normalne jačine"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Istorija hitnih obaveštenja"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Podešavanja obaveštenja"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozoravaj me na događaje opasne po život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Probna obaveštenja"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Primajte testove mobilnog operatera i mesečne testove sistema bezbednosnih upozorenja"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Primajte obaveštenja o hitnom slučaju: poruka za vežbu/obuku"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Primajte upozorenja o hitnim slučajevima: određuje operater"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibracija"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Uvek obaveštavaj punom jačinom zvuka"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignoriše Ne uznemiravaj i druga podešavanja jačine zvuka"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Obaveštenja o ažuriranju područja"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimalno vreme čekanja:"</string>
     <string name="seconds" msgid="141450721520515025">"sek"</string>
     <string name="message_copied" msgid="6922953753733166675">"Poruka je kopirana"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Mobilni operater je promenio podešavanja"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Dodirnite da biste videli podešavanja bežičnih upozorenja o hitnim slučajevima"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 5734909..d1e272a 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"Настройкі"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Выдаліць вяшчаннi"</string>
     <string name="message_options" msgid="3178489901903589574">"Параметры паведамлення"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Прагледзець звесткі"</string>
@@ -52,10 +57,14 @@
     <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">"Аўтаматычная змена налад бесправаднога экстраннага апавяшчэння на падставе даных 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">"Выкарыстоўваць сінтэз маўлення, каб прагаворваць аварыйныя апавяшчэнні па бесправадных сетках"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Апавяшчэнні пра абнаўленні па рэгіёне"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index baa65ce..db9e99a 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -18,9 +18,14 @@
     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="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">"OK"</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>
     <string name="menu_view_details" msgid="1040989019045280975">"Преглед на подробностите"</string>
@@ -52,10 +57,14 @@
     <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 въз основа на 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">"Използване на синтезиран говор за съобщенията за безжични сигнали при спешни случаи"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Излъчвания на актуализации по райони"</string>
@@ -121,7 +137,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>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d84846e..0803bd1 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"সেটিংস"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"সম্প্রচারগুলি মুছে দিন"</string>
     <string name="message_options" msgid="3178489901903589574">"মেসেজ বিকল্পগুলি"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"বিশদ বিবরণ দেখুন"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"জায়গার আপডেটের সম্প্রচার"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e2a14fa..a9945f8 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Hitna upozorenja putem bežične mreže"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Hitna upozorenja putem bežične mreže"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Hitna upozorenja putem bežične mreže"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Hitna upozorenja putem bežične mreže"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Hitna upozorenja putem bežične mreže"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informativno obavještenje"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Postavke hitnih upozorenja putem bežične mreže nisu dostupna za ovog korisnika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Uredu"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nema prethodnih upozorenja"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Postavke"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Izbriši informacije"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcije za poruke"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Prikaži detalje"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozorenja"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Poruke emitera"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Hitna upozorenja"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nepotvrđena hitna obavještenja"</string>
     <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">"Primajte obavještenja o hitnim upozorenjima bežičnim putem"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Šalji 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>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Zvuk podsjetnika će biti uobičajene jačine"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historija hitnih upozorenja"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Postavke upozorenja"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozori na događaje opasne po život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Probna upozorenja"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Primajte testove mobilnog operatera i mjesečne testove iz sistema sigurnosnih upozorenja"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Primite upozorenje za vanredne situacije: poruka za vježbu"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Primanje upozorenja u hitnim slučajevima: definira operater"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibracija"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Uvijek upozori najglasnijom jačinom zvuka"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Zanemari način rada Ne ometaj i druge postavke jačine zvuka"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Emitiranje informacija o ažuriranju područja"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimalno vrijeme čekanja:"</string>
     <string name="seconds" msgid="141450721520515025">"sekunde"</string>
     <string name="message_copied" msgid="6922953753733166675">"Poruka je kopirana"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Postavke je promijenio mobilni operater"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Dodirnite da vidite postavke hitnih upozorenja putem bežične mreže"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2ece31b..89a3ac1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alertes d\'emergència sense fil"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alertes d\'emergència sense fil"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alertes d\'emergència sense fil"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alertes d\'emergència sense fil"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alertes d\'emergència sense fil"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notificació informativa"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"La configuració de les alertes d\'emergència sense fil no estan disponibles per a aquest usuari"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"D\'acord"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"No hi ha cap alerta anterior"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Configuració"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Suprimeix les difusions"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcions del missatge"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Mostra els detalls"</string>
@@ -52,11 +57,15 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Missatges de difusió"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alertes d\'emergència"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alertes d\'emergència ignorades"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alertes d\'emergència durant les trucades de veu"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Canvis automàtics a la configuració WEA basats en la SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Permet les alertes"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Rep notificacions d\'alertes d\'emergència sense fil"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatori d\'alertes"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Reprodueix un so de recordatori a un volum normal"</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="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>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avisa\'m quan hi hagi esdeveniments potencialment mortals"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertes de prova"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Vull rebre proves de l\'operador i proves mensuals del sistema d\'alertes de seguretat"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Rep una alerta d\'emergència: missatge de simulacre o pràctica"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Vull rebre alertes d\'emergència: operador definit"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibració"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Alerta sempre al volum màxim"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignora el mode No molestis i altres opcions de configuració del volum"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Difusions d\'informació actualitzada de la zona"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Temps màxim d\'espera:"</string>
     <string name="seconds" msgid="141450721520515025">"segons"</string>
     <string name="message_copied" msgid="6922953753733166675">"El missatge s\'ha copiat"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"L\'operador ha canviat la configuració"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Toca per veure la configuració de les alertes d\'emergència sense fil"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 69b109a..337fab5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Výstražné zprávy (bezdrátové)"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Výstražné zprávy (bezdrátové)"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Výstražné zprávy (bezdrátové)"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Výstražné zprávy (bezdrátové)"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Výstražné zprávy (bezdrátové)"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informační oznámení"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Nastavení bezdrátových výstražných zpráv nejsou pro tohoto uživatele dostupná"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Žádná předchozí upozornění"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Nastavení"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Smazat informační zprávy"</string>
     <string name="message_options" msgid="3178489901903589574">"Možnosti zprávy"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Zobrazit podrobnosti"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozornění"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Zprávy informačních služeb"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Výstražné zprávy"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nepotvrzené výstražné zprávy"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Výstražné zprávy v hlasovém hovoru"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatické změny nastavení bezdrátových upozornění v nouzi na základě SIM karty"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Povolit upozornění"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Přijímat oznámení o bezdrátových výstražných zprávách"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Připomínat upozornění"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Mluvené výstražné zprávy"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Číst bezdrátové výstražné zprávy pomocí převodu textu na řeč"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Zvuky připomenutí se budou přehrávat s běžnou hlasitostí"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historie výstražných zpráv"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Předvolby upozornění"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozornění na události ohrožující život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testovací upozornění"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Dostávat testy operátora a měsíční testy ze systému bezpečnostních upozornění"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Přijmout výstražnou zprávu: testovací zpráva / cvičení"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Dostávat upozornění v nouzi: definováno operátorem"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrace"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Vždy upozorňovat s nejvyšší hlasitostí"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorovat nastavení režimu Nerušit a další nastavení hlasitosti"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Zprávy s místními aktualitami"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximální čas čekání:"</string>
     <string name="seconds" msgid="141450721520515025">"sekundy"</string>
     <string name="message_copied" msgid="6922953753733166675">"Zpráva byla zkopírována"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Nastavení byla změněna operátorem"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Klepnutím zobrazíte nastavení bezdrátových upozornění v nouzi"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a0ce0ef..a0d470b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Trådløst advarselssystem"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Trådløst advarselssystem"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Trådløst advarselssystem"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Trådløst advarselssystem"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Trådløst advarselssystem"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notifikation med oplysninger"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Denne bruger kan ikke ændre indstillingerne for det trådløse advarselssystem"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Ingen tidligere nødalarmer"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Indstillinger"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Slet meddelelser"</string>
     <string name="message_options" msgid="3178489901903589574">"Valgmuligheder for beskeder"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Se info"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alarmer"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Udsendte beskeder"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Nødalarmer"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Uaccepterede nødalarmer"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Nødalarmer under taleopkald"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"De automatiske indstillinger for det trådløse advarselssystem skifter afhængigt af SIM-kortet"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Tillad nødalarmer"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Få notifikationer fra trådløst advarselssystem"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alarm for påmindelse"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Læs advarselsmeddelelser op"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Få læst beskeder fra det trådløse advarselssystem højt"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Der afspilles en påmindelseslyd i normal lydstyrke"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historik for nødalarmer"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Præferencer for alarmer"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Advar om livstruende hændelser"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testunderretninger"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Modtag test fra dit mobilselskab og månedlige test fra systemet til sikkerhedsadvarsler"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Modtag nødalarm: Testmeddelelse"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Modtag nødunderretninger: Afhænger af mobilselskabet"</string>
     <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">"Brug altid fuld lydstyrke ved underretninger"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorer \"Forstyr ikke\" og andre indstillinger for lydstyrken"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Meddelelser om områdeopdatering"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimal ventetid:"</string>
     <string name="seconds" msgid="141450721520515025">"sekunder"</string>
     <string name="message_copied" msgid="6922953753733166675">"Beskeden blev kopieret"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Nogle indstillinger er blevet ændret af mobilselskabet"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tryk for at se indstillingerne for det trådløse advarselssystem"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ac93065..80307d7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Notfallbenachrichtigungen für Mobilgeräte"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Notfallbenachrichtigungen für Mobilgeräte"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Notfallbenachrichtigungen für Mobilgeräte"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Notfallbenachrichtigungen für Mobilgeräte"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Notfallbenachrichtigungen für Mobilgeräte"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Benachrichtigung zur Information"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Die Einstellungen für Notfallbenachrichtigungen für Mobilgeräte sind für diesen Nutzer nicht verfügbar"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Ok"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Bisher noch keine Benachrichtigungen"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Einstellungen"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Nachrichten löschen"</string>
     <string name="message_options" msgid="3178489901903589574">"Nachrichtenoptionen"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Details ansehen"</string>
@@ -52,12 +57,16 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Benachrichtigungen"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast-Nachrichten"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Notfallbenachrichtigungen"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nicht bestätigte Notfallbenachrichtigungen"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alarmmeldungen in Audioanrufen"</string>
+    <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">"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">"Bisherige Notfall­benachrichtigungen"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Bisherige Notfallbenachrichtigungen"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Benachrichtigungseinstellungen"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-Testnachrichten"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testnachrichten für Erdbeben-/Tsunami-Warnsystem"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Vor lebensbedrohlichen Ereignissen warnen"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testwarnungen"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Mobilfunkanbieter-Tests und monatliche Tests vom Sicherheitswarnsystem erhalten"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Notfallbenachrichtigung erhalten: Übungsnachricht"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Notfallbenachrichtigung erhalten: von Operator definiert"</string>
     <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="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Aktuelle Gebietsinformationen"</string>
@@ -121,7 +137,7 @@
     <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_no" msgid="3110484064328538553">"Nein"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Bisherige Notfall­benachrichtigungen"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Bisherige Notfallbenachrichtigungen"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Einmal"</item>
     <item msgid="9097229303902157183">"Alle 2 Minuten"</item>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximale Wartezeit:"</string>
     <string name="seconds" msgid="141450721520515025">"Sekunden"</string>
     <string name="message_copied" msgid="6922953753733166675">"Nachricht kopiert"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Einstellungen vom Mobilfunkanbieter geändert"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tippen, um Einstellungen für Notfallbenachrichtigungen für Mobilgeräte zu sehen"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3955323..0efbee1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -16,11 +16,16 @@
 
 <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>
+    <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">"OK"</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>
     <string name="menu_view_details" msgid="1040989019045280975">"Προβολή λεπτομερειών"</string>
@@ -52,10 +57,14 @@
     <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 με βάση τη 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">"Χρήση κειμένου σε ομιλία για εκφώνηση μηνυμάτων ειδοποιήσεων έκτακτης ανάγκης μέσω ασύρματου δικτύου"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Μεταδόσεις ενημέρωσης για την περιοχή"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index c27cba5..4d05291 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Wireless emergency alerts"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informational notification"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Wireless emergency alert settings are not available for this user"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"No previous alerts"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Settings"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Delete broadcasts"</string>
     <string name="message_options" msgid="3178489901903589574">"Message options"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"View details"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Emergency alerts"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Unacknowledged emergency alerts"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Emergency alerts in voice call"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatic WEA settings changes based on SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Allow alerts"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Receive wireless emergency alert notifications"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alert reminder"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Use text-to-speech to speak wireless emergency alert messages"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"A reminder sound will play at regular volume"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Test alerts"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receive operator tests and monthly tests from the safety alert system"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Receive emergency alert: exercise/drill message"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Receive emergency alert: Operator defined"</string>
     <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">"Always alert at full volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignore Do Not Disturb and other volume settings"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximum waiting time:"</string>
     <string name="seconds" msgid="141450721520515025">"seconds"</string>
     <string name="message_copied" msgid="6922953753733166675">"Message copied"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Settings changed by operator"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tap to see wireless emergency alert settings"</string>
 </resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index c27cba5..4d05291 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Wireless emergency alerts"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informational notification"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Wireless emergency alert settings are not available for this user"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"No previous alerts"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Settings"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Delete broadcasts"</string>
     <string name="message_options" msgid="3178489901903589574">"Message options"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"View details"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Emergency alerts"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Unacknowledged emergency alerts"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Emergency alerts in voice call"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatic WEA settings changes based on SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Allow alerts"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Receive wireless emergency alert notifications"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alert reminder"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Use text-to-speech to speak wireless emergency alert messages"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"A reminder sound will play at regular volume"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Test alerts"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receive operator tests and monthly tests from the safety alert system"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Receive emergency alert: exercise/drill message"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Receive emergency alert: Operator defined"</string>
     <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">"Always alert at full volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignore Do Not Disturb and other volume settings"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximum waiting time:"</string>
     <string name="seconds" msgid="141450721520515025">"seconds"</string>
     <string name="message_copied" msgid="6922953753733166675">"Message copied"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Settings changed by operator"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tap to see wireless emergency alert settings"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c27cba5..4d05291 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Wireless emergency alerts"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informational notification"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Wireless emergency alert settings are not available for this user"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"No previous alerts"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Settings"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Delete broadcasts"</string>
     <string name="message_options" msgid="3178489901903589574">"Message options"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"View details"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Emergency alerts"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Unacknowledged emergency alerts"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Emergency alerts in voice call"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatic WEA settings changes based on SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Allow alerts"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Receive wireless emergency alert notifications"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alert reminder"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Use text-to-speech to speak wireless emergency alert messages"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"A reminder sound will play at regular volume"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Test alerts"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receive operator tests and monthly tests from the safety alert system"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Receive emergency alert: exercise/drill message"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Receive emergency alert: Operator defined"</string>
     <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">"Always alert at full volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignore Do Not Disturb and other volume settings"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximum waiting time:"</string>
     <string name="seconds" msgid="141450721520515025">"seconds"</string>
     <string name="message_copied" msgid="6922953753733166675">"Message copied"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Settings changed by operator"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tap to see wireless emergency alert settings"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c27cba5..4d05291 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Wireless emergency alerts"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Wireless emergency alerts"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informational notification"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Wireless emergency alert settings are not available for this user"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"No previous alerts"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Settings"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Delete broadcasts"</string>
     <string name="message_options" msgid="3178489901903589574">"Message options"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"View details"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Emergency alerts"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Unacknowledged emergency alerts"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Emergency alerts in voice call"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatic WEA settings changes based on SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Allow alerts"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Receive wireless emergency alert notifications"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alert reminder"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Use text-to-speech to speak wireless emergency alert messages"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"A reminder sound will play at regular volume"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Warn about life-threatening events"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Test alerts"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receive operator tests and monthly tests from the safety alert system"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Receive emergency alert: exercise/drill message"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Receive emergency alert: Operator defined"</string>
     <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">"Always alert at full volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignore Do Not Disturb and other volume settings"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximum waiting time:"</string>
     <string name="seconds" msgid="141450721520515025">"seconds"</string>
     <string name="message_copied" msgid="6922953753733166675">"Message copied"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Settings changed by operator"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tap to see wireless emergency alert settings"</string>
 </resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index a780fb4..f196104 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎Wireless emergency alerts‎‏‎‎‏‎"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎Wireless emergency alerts‎‏‎‎‏‎"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎Wireless emergency alerts‎‏‎‎‏‎"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎Wireless emergency alerts‎‏‎‎‏‎"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎Wireless emergency alerts‎‏‎‎‏‎"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎Informational notification‎‏‎‎‏‎"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎Wireless emergency alert settings are not available for this user‎‏‎‎‏‎"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎OK‎‏‎‎‏‎"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎No previous alerts‎‏‎‎‏‎"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎Settings‎‏‎‎‏‎"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎Delete broadcasts‎‏‎‎‏‎"</string>
     <string name="message_options" msgid="3178489901903589574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎Message options‎‏‎‎‏‎"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎View details‎‏‎‎‏‎"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎Alerts‎‏‎‎‏‎"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎Broadcast messages‎‏‎‎‏‎"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎Emergency alerts‎‏‎‎‏‎"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎Unacknowledged Emergency alerts‎‏‎‎‏‎"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎Emergency alerts in voice call‎‏‎‎‏‎"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎Automatic WEA Settings changes based on SIM‎‏‎‎‏‎"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‎Allow alerts‎‏‎‎‏‎"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‏‏‎‎‏‎Receive wireless emergency alert notifications‎‏‎‎‏‎"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎Alert reminder‎‏‎‎‏‎"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎Speak alert message‎‏‎‎‏‎"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‎Use text-to-speech to speak wireless emergency alert messages‎‏‎‎‏‎"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎A reminder sound will play at regular volume‎‏‎‎‏‎"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎Emergency alert history‎‏‎‎‏‎"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎Alert preferences‎‏‎‎‏‎"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎Warn about life-threatening events‎‏‎‎‏‎"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎Test alerts‎‏‎‎‏‎"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎Receive carrier tests and monthly tests from the safety alert system‎‏‎‎‏‎"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎Receive emergency alert: Exercise/Drill message‎‏‎‎‏‎"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎Receive emergency alert: Operator defined‎‏‎‎‏‎"</string>
     <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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎Always alert at full volume‎‏‎‎‏‎"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎Ignore Do Not Disturb &amp; other volume settings‎‏‎‎‏‎"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎Area update broadcasts‎‏‎‎‏‎"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎Maximum waiting time:‎‏‎‎‏‎"</string>
     <string name="seconds" msgid="141450721520515025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎seconds‎‏‎‎‏‎"</string>
     <string name="message_copied" msgid="6922953753733166675">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎Message copied‎‏‎‎‏‎"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎Settings changed by carrier‎‏‎‎‏‎"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎Tap to see wireless emergency alert settings‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b54aabc..e271f54 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alertas de emergencia inalámbricas"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alertas de emergencia inalámbricas"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alertas de emergencia inalámbricas"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alertas de emergencia inalámbricas"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alertas de emergencia inalámbricas"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notificación informativa"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"La configuración de alertas de emergencia inalámbricas no está disponible para este usuario"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Aceptar"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Sin alertas anteriores"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Configuración"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Eliminar difusiones"</string>
     <string name="message_options" msgid="3178489901903589574">"Opciones de mensaje"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ver detalles"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensajes de transmisión"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alertas de emergencia"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alertas de emergencia ignoradas"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alertas de emergencia durante llamadas de voz"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Cambios automáticos de la configuración de alertas de emergencia inalámbricas según la tarjeta SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Permitir alertas"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Recibir alertas 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">"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">"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>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Alertar sobre eventos peligrosos"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertas de prueba"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Recibir pruebas del proveedor y pruebas mensuales del sistema de alertas de seguridad"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Recibe alertas de emergencia: mensaje de simulación/entrenamiento"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Recibir alertas de emergencia: se definió un operador"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibración"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Siempre reproducir alertas en volumen máximo"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorar No interrumpir y otras opciones de configuración de volumen"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Emisiones de información actualizada del área"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Tiempo máximo de espera:"</string>
     <string name="seconds" msgid="141450721520515025">"segundos"</string>
     <string name="message_copied" msgid="6922953753733166675">"Se copió el mensaje"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"El proveedor cambió la configuración"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Presiona para ver la configuración de alertas de emergencia inalámbricas"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 849942b..91534f8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alertas de emergencia inalámbricas"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alertas de emergencia inalámbricas"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alertas de emergencia inalámbricas"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alertas de emergencia inalámbricas"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alertas de emergencia inalámbricas"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notificación informativa"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Este usuario no puede modificar la configuración de las alertas de emergencia inalámbricas"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Aceptar"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"No hay alertas anteriores"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Ajustes"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Eliminar emisiones"</string>
     <string name="message_options" msgid="3178489901903589574">"Opciones del mensaje"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ver detalles"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensajes de difusión"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alertas de emergencias"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alertas de emergencia ignoradas"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alertas de emergencia en llamadas"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Cambios automáticos según la SIM en los ajustes de las alertas de emergencia inalámbricas"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Permitir alertas"</string>
     <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 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>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Advertencia sobre eventos que pueden ser mortales"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertas de prueba"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Recibe pruebas de operadores y pruebas mensuales del sistema de alertas de seguridad"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Recibir alerta de emergencia: mensaje de Ejercicio/Simulacro"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Recibir alertas de emergencia definidas por el operador"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibración"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Las alertas sonarán siempre a todo volumen"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorar el modo No molestar y otros ajustes de volumen"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Difusiones de información actualizada de la zona"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Tiempo máximo de espera:"</string>
     <string name="seconds" msgid="141450721520515025">"segundos"</string>
     <string name="message_copied" msgid="6922953753733166675">"Se ha copiado el mensaje"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Ajustes cambiados por el operador"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Toca para ver los ajustes de las alertas de emergencia inalámbricas"</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 524b5e8..07cece7 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <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 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>
     <string name="menu_view_details" msgid="1040989019045280975">"Kuva üksikasjad"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Teatised"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sõnumite edastamine"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Hädaolukorra teatised"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Tähelepanuta jäänud hädaolukorra hoiatused"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Hädaolukorra teatised häälkõnes"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"WEA seadete automaatsed muudatused SIM-kaardi põhjal"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Teatiste lubamine"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Saate juhtmevabalt hädaolukorra teatisi"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Märguannete meeldetuletus"</string>
+    <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">"Eriolukorra teatiste ajalugu"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Teatiste eelistused"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Hoiatused eluohtlike sündmuste puhul"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testteatised"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Turvahoiatussüsteem saadab operaatori teste ja igakuiseid teste"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Hädaolukorra märguande saamine: treeningsõnum"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Saadetakse hädaolukorra märguanne: operaatori määratud"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibreerimine"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Teavita alati maksimaalse helitugevusega"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Eira funktsiooni Mitte segada ja teisi helitugevuse seadeid"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Piirkonna värskenduste edastamine"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimaalne ooteaeg:"</string>
     <string name="seconds" msgid="141450721520515025">"sekundit"</string>
     <string name="message_copied" msgid="6922953753733166675">"Sõnum on kopeeritud"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Operaator muutis seadeid"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Puudutage juhtmevabade hädaolukorra teatiste seadete nägemiseks"</string>
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d46abde..8cac097 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Hari gabeko larrialdi-alertak"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Hari gabeko larrialdi-alertak"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Hari gabeko larrialdi-alertak"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Hari gabeko larrialdi-alertak"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Hari gabeko larrialdi-alertak"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informazioa emateko jakinarazpena"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Erabiltzaile honek ez ditu erabilgarri hari gabeko larrialdi-alerten ezarpenak"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Ados"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Ez dago aurreko alertarik"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Ezarpenak"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Ezabatu igorpenak"</string>
     <string name="message_options" msgid="3178489901903589574">"Mezuaren aukerak"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ikusi xehetasunak"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertak"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Igorpen-mezuak"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Larrialdi-alertak"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Ez ikusi egin zaien larrialdi-alertak"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Larrialdien alertak ahots-deietan"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Hari gabeko larrialdi-alerten ezarpenak automatikoki aldatu dira SIMean oinarrituta"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Baimendu alertak"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Jaso hari gabeko larrialdi-alerten jakinarazpenak"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alerta-egoeraren abisua"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Irakurri alerta-mezua ozen"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Erabili testua ahots bihurtzeko eginbidea hari gabeko larrialdi-alertak ozen irakurtzeko"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Abisu-soinu batek joko du ohiko bolumenean"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Larrialdi-alerten historia"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Alerten hobespenak"</string>
@@ -75,9 +84,16 @@
     <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">"Probako alertak"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testu-mezu bidezko 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 />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Jaso larrialdi-alerta: probako mezua"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Jaso larrialdi-alertak: operadorea zehaztu da"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Dardara"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Alertak beti gehieneko bolumenean"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ez ikusi egin ez molestatzeko moduari eta beste bolumen-ezarpen batzuei"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Inguruko berritasunei buruzko igorpenak"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Gehieneko itxarote-denbora:"</string>
     <string name="seconds" msgid="141450721520515025">"segundo"</string>
     <string name="message_copied" msgid="6922953753733166675">"Kopiatu da mezua"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Operadoreak ezarpenak aldatu ditu"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Saka ezazu hari gabeko larrialdi-alerten ezarpenak ikusteko"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 52a6817..4cbb419 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"تنظیمات"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"حذف پخش ها"</string>
     <string name="message_options" msgid="3178489901903589574">"گزینه‌های پیام"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"مشاهده جزئيات"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"پخش‌های به‌روزرسانی منطقه"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 172cd16..af7398a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Langattomat hätähälytykset"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Langattomat hätähälytykset"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Langattomat vaaratiedotteet"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Langattomat vaaratiedotteet"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Langattomat vaaratiedotteet"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Ilmoitus"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Tällä käyttäjällä ei ole pääsyä langattomien vaaratiedotteiden asetuksiin"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Ei aiempia hälytyksiä"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Asetukset"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Poista lähetyksiä"</string>
     <string name="message_options" msgid="3178489901903589574">"Viestiasetukset"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Näytä tiedot"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Ilmoitukset"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Lähetysviestit"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Hätätiedotteet"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Huomaamatta jääneet hätähälytykset"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Hätähälytykset äänipuhelun aikana"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Langattomien vaaratiedotteiden automaattiset asetukset muuttuneet SIM-kortin perusteella"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Salli hälytykset"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Vastaanota langattomia vaaratiedotteita"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Ilmoitusmuistutus"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Puhu varoitusilmoitus"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Käytä tekstistä puheeksi -toimintoa langattomissa vaaratiedotteissa"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Muistutusääni soi tavallisella äänenvoimakkuudella"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Vaaratiedotehistoria"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Ilmoitusasetukset"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Varoita hengenvaarallisista tapahtumista"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testivaroitukset"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Vastaanota turvahälytysjärjestelmän operaattoritestejä ja kuukausittaisia testejä"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Vastaanota vaaratiedote: harjoitusviesti"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Vastaanota vaaratiedote: operaattori määritetty"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Värinä"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Soita ilmoitusääni täydellä äänenvoimakkuudella"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ohita Älä häiritse- ja muut äänenvoimakkuusasetukset"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Alueelliset ilmoitukset"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Odotuksen enimmäisaika:"</string>
     <string name="seconds" msgid="141450721520515025">"sekuntia"</string>
     <string name="message_copied" msgid="6922953753733166675">"Viesti kopioitu"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Operaattori muuttanut asetuksia"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Katso langattomien vaaratiedotteiden asetukset napauttamalla"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 20f9640..e936992 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alertes d\'urgence sans fil"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alertes d\'urgence sans fil"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alertes d\'urgence sans fil"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alertes d\'urgence sans fil"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alertes d\'urgence sans fil"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notification informative"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Les paramètres des alertes d\'urgence sans fil ne sont pas accessibles pour cet utilisateur"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Aucune alerte précédente"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Paramètres"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Supprimer les diffusions"</string>
     <string name="message_options" msgid="3178489901903589574">"Options relatives aux messages"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Afficher les détails"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messages de diffusion"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alertes d\'urgence"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alertes d\'urgence non lues"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alertes d’urgence dans les appels vocaux"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Changements automatiques aux paramètres WEA en fonction de la carte SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Autoriser les alertes"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Recevoir les notifications d\'alerte d\'urgence sans fil"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Rappel d\'alerte"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Énoncer le message d\'alerte"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Utiliser la synthèse vocale pour énoncer les messages d\'alerte d\'urgence sans fil"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Un son de rappel jouera à un volume régulier"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historique des alertes d\'urgence"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Préférences d\'alertes"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avertir des événements potentiellement mortels"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertes tests"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Recevoir des tests du fournisseur de services et des tests mensuels du système d\'alertes de sécurité"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Recevoir une alerte d\'urgence : message en cas d\'exercice ou de simulation"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Recevoir les alertes d\'urgence : défini par le fournisseur de services"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrations"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Toujours émettre les alertes au plein volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorer le mode Ne pas déranger et d\'autres paramètres de volume"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Diffusion de mises à jour régionales"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Durée d\'attente maximale :"</string>
     <string name="seconds" msgid="141450721520515025">"secondes"</string>
     <string name="message_copied" msgid="6922953753733166675">"Message copié"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Les paramètres ont été modifiés par le fournisseur de services"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Touchez pour voir les paramètres des alertes d\'urgence sans fil"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c559006..576dae3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alertes d\'urgence sans fil"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alertes d\'urgence sans fil"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alertes d\'urgence sans fil"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alertes d\'urgence sans fil"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alertes d\'urgence sans fil"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notification d\'information"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Cet utilisateur n\'a pas accès aux paramètres d\'alertes d\'urgence sans fil"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Aucune alerte"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Paramètres"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Supprimer les diffusions"</string>
     <string name="message_options" msgid="3178489901903589574">"Options relatives aux messages"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Afficher les détails"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messages de diffusion"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alertes d\'urgence"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alertes d\'urgence non confirmées"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alertes d\'urgence pendant l\'appel téléphonique"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Modifications automatiques des paramètres des alertes d\'urgence sans fil en fonction de la carte SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Autoriser les alertes"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Recevoir les notifications d\'alerte d\'urgence sans fil"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Rappel d\'alerte"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Énoncer un message d\'alerte"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Utiliser la synthèse vocale pour énoncer des messages d\'alerte d\'urgence sans fil"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Volume normal pour les rappels"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historique des alertes d\'urgence"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Préférences pour les alertes"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Recevoir des avertissements relatifs aux événements potentiellement mortels"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertes de test"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Recevoir des tests de l\'opérateur et des tests mensuels du système d\'alertes de sécurité"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Recevoir une alerte d\'urgence : message en cas d\'exercice/de simulation"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Recevoir une alerte d\'urgence : défini par l\'opérateur"</string>
     <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">"Conserver le volume maximal pour les alertes"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorer Ne pas déranger et les autres paramètres de volume"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Diffusion des dernières informations locales"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Temps d\'attente maximal :"</string>
     <string name="seconds" msgid="141450721520515025">"secondes"</string>
     <string name="message_copied" msgid="6922953753733166675">"Message copié"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Paramètres modifiés par l\'opérateur"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Appuyez pour voir les paramètres des alertes d\'urgence sans fil"</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index bf5b221..67a65c6 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alertas de emerxencia sen fíos"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alertas de emerxencia sen fíos"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alertas de emerxencia sen fíos"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alertas de emerxencia sen fíos"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alertas de emerxencia sen fíos"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notificación informativa"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"A configuración das alertas de emerxencia sen fíos non está dispoñible para este usuario"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Aceptar"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Non hai alertas anteriores"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Configuración"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Eliminar emisións"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcións das mensaxes"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ver detalles"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensaxes de difusión"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alertas de emerxencia"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alertas de emerxencia sen confirmar"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alertas de emerxencia durante as chamadas de voz"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Cambios na configuración automática das alertas de emerxencia baseados na SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Permitir alertas"</string>
     <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="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>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Recibe advertencias de eventos que poñen a vida en perigo"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertas de proba"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Recibe probas do operador e probas mensuais do sistema de alertas de seguranza"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Recibe unha alerta de emerxencia: mensaxe de simulacro ou práctica"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Recibe alertas de emerxencia segundo o que indique o operador"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibración"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Alertar sempre cando o volume estea ao máximo"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignora o modo Non molestar e outras opcións de configuración do volume"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Emisións de información actualizada sobre a zona"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Tempo de espera máximo:"</string>
     <string name="seconds" msgid="141450721520515025">"segundos"</string>
     <string name="message_copied" msgid="6922953753733166675">"Copiouse a mensaxe"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"O operador cambiou a configuración"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Toca para ver a configuración das alertas de emerxencia sen fíos"</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 34ca8ec..4784718 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"સેટિંગ્સ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"બ્રોડકાસ્ટ્સ કાઢી નાખો"</string>
     <string name="message_options" msgid="3178489901903589574">"સંદેશ વિકલ્પો"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"વિગતો જુઓ"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"વિસ્તારના અપડેટ વિશેના બ્રૉડકાસ્ટ"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bbb5ae3..6e37852 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"सेटिंग"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"प्रसारण मिटाएं"</string>
     <string name="message_options" msgid="3178489901903589574">"संदेश विकल्‍प"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"विवरण देखें"</string>
@@ -52,13 +57,17 @@
     <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_summary" msgid="5583168548073938617">"वायरलेस इमरजेंसी अलर्ट की सूचनाएं पाएं"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"अलर्ट रिमाइंडर"</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">"वायरलेस इमरजेंसी अलर्ट वाला मैसेज बोलने के लिए लिखाई को बोली में बदलने की सुविधा इस्तेमाल करें"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"क्षेत्र अपडेट प्रसारण"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f5a9538..d5a45f4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Hitna upozorenja putem bežične mreže"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Hitna upozorenja putem bežične mreže"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Hitna upozorenja putem bežične mreže"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Hitna upozorenja putem bežične mreže"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Hitna upozorenja putem bežične mreže"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informativna obavijest"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Postavke hitnih upozorenja putem bežične mreže nisu dostupne za ovog korisnika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"U redu"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nema prethodnih upozorenja"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Postavke"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Izbriši emitiranja"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcije poruka"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Prikaz pojedinosti"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozorenja"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Emitirane poruke"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Hitna upozorenja"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nepotvrđena hitna upozorenja"</string>
     <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">"Primajte obavijesti o hitnim upozorenjima putem bežične mreže"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Primanje 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>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Zvuk podsjetnika bit će normalne jačine"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Povijest hitnih upozorenja"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Postavke upozorenja"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozorenja o događajima opasnima po život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testiranje upozorenja"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Primajte testove mobilnog operatera i mjesečne testove sustava sigurnosnih upozorenja"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Primanje hitnih upozorenja: poruka o vježbi"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Primajte hitno upozorenje: operator je definiran"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibracija"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Uvijek upozori s punom jačinom"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Zanemari Ne uznemiravaj i druge postavke glasnoće"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Emitiranja obavijesti za područje"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimalno vrijeme čekanja:"</string>
     <string name="seconds" msgid="141450721520515025">"s"</string>
     <string name="message_copied" msgid="6922953753733166675">"Poruka je kopirana"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Mobilni operater promijenio je postavke"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Dodirnite da biste vidjeli postavke hitnih upozorenja putem bežične mreže"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 05b75d4..4997311 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Vezeték nélküli vészjelzések"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Vezeték nélküli vészjelzések"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Vezeték nélküli vészriasztások"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Vezeték nélküli vészriasztások"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Vezeték nélküli vészriasztások"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Tájékoztató értesítés"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"A vezeték nélküli vészjelzések beállításai nem állnak rendelkezésre ennél a felhasználónál"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nincs korábbi értesítés"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Beállítások"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Adások törlése"</string>
     <string name="message_options" msgid="3178489901903589574">"Üzenetbeállítások"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Részletek megtekintése"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Figyelmeztetések"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sugárzott üzenetek"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Vészriasztások"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Vissza nem igazolt vészriasztások"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Vészriasztások hanghívás közben"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Az automatikus WEA-beállítások a SIM-kártya alapján változnak"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Figyelmeztetések engedélyezése"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Vezeték nélküli vészjelzések fogadása"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Figyelmeztetési emlékeztető"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Figyelmeztetés felolvasása"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Használja a szövegfelolvasót a vészjelző üzenetek felolvasására"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Emlékeztető hang szól majd a szokásos hangerőn"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Vészjelzési előzmények"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Figyelmeztetések beállításai"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Életet veszélyeztető eseményekkel kapcsolatos figyelmeztetés"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Próbariasztások"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"A biztonsági figyelmeztető rendszer szolgáltatói és havi tesztjeinek fogadása"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Vészjelzés fogadása: Gyakorlati/próbaüzenet"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Vészjelzés fogadása: szolgáltató megadva"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Rezgés"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Értesítés mindig teljes hangerőn"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"A „Ne zavarjanak” funkció és más hangerő-beállítások figyelmen kívül hagyása"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Területalapú frissítések sugárzása"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximális várakozási idő:"</string>
     <string name="seconds" msgid="141450721520515025">"másodperc"</string>
     <string name="message_copied" msgid="6922953753733166675">"Üzenet vágólapra másolva"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"A szolgáltató megváltoztatta a beállításokat"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Koppintson ide a vezeték nélküli vészjelzések beállításainak megtekintéséhez"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index be7a304..c3a15a4 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"Կարգավորումներ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Ջնջել հեռարձակումները"</string>
     <string name="message_options" msgid="3178489901903589574">"Հաղորդագրության ընտրանքներ"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Տեսնել մանրամասները"</string>
@@ -52,10 +57,14 @@
     <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 ավտոմատ կարգավորումները փոխվել են 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">"Օգտագործել տեքստի հնչեցումը՝ արտակարգ իրավիճակների անլար ծանուցումներն ընթերցելու համար"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Տեղական ծանուցող հեռարձակումներ"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index cf4ace7..aaeba59 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Peringatan darurat nirkabel"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Peringatan darurat nirkabel"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Notifikasi darurat nirkabel"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Peringatan darurat nirkabel"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Peringatan darurat nirkabel"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notifikasi informasi"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Setelan notifikasi darurat nirkabel tidak tersedia untuk pengguna ini"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Oke"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Tidak ada peringatan sebelumnya"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Setelan"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Hapus siaran"</string>
     <string name="message_options" msgid="3178489901903589574">"Opsi pesan"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Tampilkan detail"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Peringatan"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Pesan broadcast"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Peringatan darurat"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Peringatan Darurat yang Tidak Dikonfirmasi"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Peringatan darurat dalam panggilan suara"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Setelan WEA otomatis diubah berdasarkan SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Izinkan peringatan"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Terima peringatan darurat nirkabel"</string>
     <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 sedang"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Histori peringatan darurat"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferensi peringatan"</string>
@@ -77,7 +86,14 @@
     <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">"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>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Terima peringatan darurat: Operator ditentukan"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Getaran"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Selalu ingatkan dengan volume penuh"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Abaikan fitur Jangan Ganggu &amp; setelan volume lainnya"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Siaran update area"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Waktu tunggu maksimum:"</string>
     <string name="seconds" msgid="141450721520515025">"detik"</string>
     <string name="message_copied" msgid="6922953753733166675">"Pesan disalin"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Setelan diubah oleh operator"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Ketuk untuk melihat setelan peringatan darurat nirkabel"</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 6c9bcd7..6143aeb 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Þráðlausar neyðartilkynningar"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Þráðlausar neyðartilkynningar"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Þráðlausar neyðartilkynningar"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Þráðlausar neyðartilkynningar"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Þráðlausar neyðartilkynningar"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Upplýsingatilkynning"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Stillingar fyrir þráðlausar neyðartilkynningar eru ekki í boði fyrir þennan notanda"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Í lagi"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Engar fyrri viðvaranir"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Stillingar"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Eyða útsendingum"</string>
     <string name="message_options" msgid="3178489901903589574">"Valkostir skilaboða"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Skoða upplýsingar"</string>
@@ -52,19 +57,23 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Tilkynningar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Útsendingarskilaboð"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Neyðartilkynningar"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Neyðartilkynningar sem var ekki brugðist við"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Neyðartilkynningar í símtali"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Sjálfvirkar breytingar á stillingum þráðlausra neyðarviðvarana (WEA) byggðar á SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Leyfa tilkynningar"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Fá þráðlausar neyðartilkynningar"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Áminning"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Lesa upp viðvörunarskilaboð"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Nota talgervil til að lesa skilaboð þráðlausra neyðartilkynninga upphátt"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Áminningarhljóð er spilað með venjulegum hljóðstyrk"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Neyðarviðvörunarferill"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Tilkynningarstillingar"</string>
     <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">"Líf eða eignir eru í mjög mikilli hættu"</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_severe_threat_alerts_title" msgid="1066172973703410042">"Alvarlegar ógnir"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Líf eða eignir í mikilli hættu"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Líf eða eignir í alvarlegri 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>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Vara við lífshættulegum atburðum"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Prófa tilkynningar"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Fá prufuskilaboð frá símafyrirtæki og mánaðarlegar prófanir frá öryggisviðvörunarkerfinu"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Fá neyðarviðvörun: æfinga-/prufuskilaboð"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Fá neyðarviðvörun: skilgreint af símafyrirtæki"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Titringur"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Spila allar tilkynningar með fullum hljóðstyrk"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Hunsa „Ónáðið ekki“ og aðrar hljóðstyrksstillingar"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Staðbundnar uppfærslur"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Hámarksbiðtími:"</string>
     <string name="seconds" msgid="141450721520515025">"sekúndur"</string>
     <string name="message_copied" msgid="6922953753733166675">"Skilaboð afrituð"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Stillingum breytt af símafyrirtæki"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Ýttu til að sjá stillingar þráðlausra neyðarviðvarana"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 29d8336..c75fe7a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -16,17 +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">"Allerte wireless di emergenza"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"Allerte wireless di emergenza"</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="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="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="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nessuna allerta precedente"</string>
+    <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nessun\'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 allerta"</string>
-    <string name="view_details_debugging_title" msgid="5699927030805114173">"Dettagli allerta per il debug"</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="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>
@@ -36,26 +41,30 @@
     <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">"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_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_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">"Allerta di emergenza (esercitazione)"</string>
-    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Allerta di emergenza (operatore)"</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="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">"Allerta di emergenza"</string>
+    <string name="emergency_alert" msgid="624783871477634263">"Avviso 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="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="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 allerte"</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="alert_reminder_dialog_title" msgid="2299010977651377315">"Verrà riprodotto un suono di promemoria a volume normale"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Cronologia allerte di emergenza"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferenze per le allerte"</string>
@@ -67,7 +76,7 @@
     <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">"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 allerta"</string>
+    <string name="enable_alert_message_title" msgid="2939830587633599352">"Messaggi di avviso"</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>
@@ -77,12 +86,19 @@
     <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">"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>
+    <!-- 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_alert_vibrate_title" msgid="5421032189422312508">"Vibrazione"</string>
-    <string name="override_dnd_title" msgid="5120805993144214421">"Allerta sempre a tutto volume"</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_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 allerta:"</string>
+    <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria avviso:"</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>
@@ -116,7 +132,7 @@
     <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 la prima allerta (diversa da un\'allerta presidenziale)."</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_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>
@@ -129,7 +145,7 @@
     <item msgid="3863339891188103437">"Ogni 15 minuti"</item>
     <item msgid="7388573183644474611">"Mai"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Allerte wireless di emergenza"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"Allerta 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>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Tempo massimo di attesa:"</string>
     <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>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index eba22c8..9698d8c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,16 +17,21 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"התרעות אלחוטיות על מקרי חירום"</string>
-    <string name="sms_cb_settings" msgid="9021266457863671070">"התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_settings" msgid="9021266457863671070">"התראות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"התרעות אלחוטיות על מקרי חירום"</string>
+    <string name="sms_cb_sender_name_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>
     <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="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>
@@ -36,53 +41,64 @@
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"אזהרת רעידת אדמה וצונאמי"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"‏הודעה על בדיקת ETWS"</string>
     <string name="etws_other_emergency_type" msgid="5233080551309721499">"אזהרת חירום"</string>
-    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"התרעה נשיאותית"</string>
-    <string name="cmas_extreme_alert" msgid="2588720613319969289">"התרעת חירום: חמורה ביותר"</string>
-    <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"התרעת חירום: חמורה ביותר"</string>
-    <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"התרעת חירום: חמורה ביותר"</string>
-    <string name="cmas_severe_alert" msgid="4135809475315826913">"התרעת חירום: חמורה"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"‏חטיפת ילד (התרעת Amber)"</string>
+    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"התראה נשיאותית"</string>
+    <string name="cmas_extreme_alert" msgid="2588720613319969289">"התראת חירום: חמורה ביותר"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="2328845915287460780">"התראת חירום: חמורה ביותר"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="1859702950323471778">"התראת חירום: חמורה ביותר"</string>
+    <string name="cmas_severe_alert" msgid="4135809475315826913">"התראת חירום: חמורה"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"‏חטיפת ילד (Amber Alert)"</string>
     <string name="cmas_required_monthly_test" msgid="1890205712251132193">"בדיקה חודשית נדרשת"</string>
-    <string name="cmas_exercise_alert" msgid="2892255514938370321">"התרעת חירום (תרגיל)"</string>
-    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"התרעת חירום (מפעיל)"</string>
+    <string name="cmas_exercise_alert" msgid="2892255514938370321">"התראת חירום (תרגיל)"</string>
+    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"התראת חירום (מפעיל)"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"הודעות שידור"</string>
     <string name="public_safety_message" msgid="9119928798786998252">"הודעה ביטחונית"</string>
     <string name="state_local_test_alert" msgid="8003145745857480200">"בדיקה מקומית/ארצית"</string>
-    <string name="emergency_alert" msgid="624783871477634263">"התרעה על מקרה חירום"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"התרעות"</string>
+    <string name="emergency_alert" msgid="624783871477634263">"התראה על מקרה חירום"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"התראות"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"הודעות שידור"</string>
-    <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"התרעות חירום"</string>
+    <string name="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="enable_alerts_master_toggle_title" msgid="1457904343636699446">"הצגת התרעות"</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="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_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>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"שידורי בדיקה של מערכת ההתראות על צונאמי ורעידות אדמה"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"איומים קיצוניים"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"איומים קיצוניים לנפש ולרכוש"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"איומים חמורים"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"איומים חמורים לנפש ולרכוש"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏התרעות AMBER"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏התראות AMBER"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"מבזקי חירום על חטיפת ילדים"</string>
-    <string name="enable_alert_message_title" msgid="2939830587633599352">"הודעות התרעה"</string>
+    <string name="enable_alert_message_title" msgid="2939830587633599352">"הודעות התראה"</string>
     <string name="enable_alert_message_summary" msgid="6525664541696985610">"אנו רוצה לקבל אזהרות מפני איומי אבטחה מידיים"</string>
     <string name="enable_public_safety_messages_title" msgid="5576770949182656524">"הודעות שקשורות לביטחון הציבור"</string>
     <string name="enable_public_safety_messages_summary" msgid="7868069748857851521">"פעולות מומלצות שיכולות לעזור בהצלת חיים או רכוש"</string>
     <string name="enable_state_local_test_alerts_title" msgid="1012930918171302720">"בדיקות מקומיות וארציות"</string>
     <string name="enable_state_local_test_alerts_summary" msgid="780298327377950187">"קבלת הודעות בדיקה מרשויות מקומיות וארציות"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"התרעות חירום"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="661894007489847468">"התראות חירום"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"יש להזהיר אותי מפני אירועים מסכני חיים"</string>
     <string name="enable_cmas_test_alerts_title" msgid="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="override_dnd_title" msgid="5120805993144214421">"צליל ההתרעה יושמע תמיד בעוצמת הקול המרבית"</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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"שידורי עדכונים רלוונטיים לאזור"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"‏הצגה של פרטי עדכון בסטטוס ה-SIM"</string>
-    <string name="cmas_category_heading" msgid="3923503130776640717">"קטגוריית התרעה:"</string>
+    <string name="cmas_category_heading" msgid="3923503130776640717">"קטגוריית התראה:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"גיאופיזית"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"מטאורולוגית"</string>
     <string name="cmas_category_safety" msgid="2986472639641883453">"בטיחות"</string>
@@ -114,14 +130,14 @@
     <string name="cmas_certainty_observed" msgid="3668549749352106472">"נצפתה"</string>
     <string name="cmas_certainty_likely" msgid="4254497828943291749">"סבירה"</string>
     <string name="delivery_time_heading" msgid="5980836543433619329">"התקבלה:"</string>
-    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> התרעות שלא נקראו."</string>
-    <string name="notification_multiple_title" msgid="1523638925739947855">"התרעות חדשות"</string>
-    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"הצגת תיבת דו-שיח לביטול הסכמה לאחר הצגת ההתרעה הראשונה (מלבד התרעה נשיאותית)."</string>
+    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> התראות שלא נקראו."</string>
+    <string name="notification_multiple_title" msgid="1523638925739947855">"התראות חדשות"</string>
+    <string name="show_cmas_opt_out_summary" msgid="6926059266585295440">"הצגת תיבת דו-שיח לביטול הסכמה לאחר הצגת ההתראה הראשונה (מלבד התראה נשיאותית)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"הצגה של תיבת דו שיח לביטול הסכמה"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"ההגדרה שלך עכשיו היא לקבל התרעות אלחוטיות על מקרי חירום. האם ברצונך להמשיך ולקבל התרעות אלחוטיות על מקרי חירום?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="4820577535626084938">"ההגדרה שלך עכשיו היא לקבל התראות אלחוטיות על מקרי חירום. האם ברצונך להמשיך ולקבל התראות אלחוטיות על מקרי חירום?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"כן"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"לא"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"היסטוריה של התרעות חירום"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"היסטוריה של התראות חירום"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"פעם אחת"</item>
     <item msgid="9097229303902157183">"כל שתי דקות"</item>
@@ -129,8 +145,8 @@
     <item msgid="3863339891188103437">"כל 15 דקות"</item>
     <item msgid="7388573183644474611">"אף פעם"</item>
   </string-array>
-    <string name="emergency_alert_settings_title_watches" msgid="4477073412799894883">"התרעות על מקרי חירום"</string>
-    <string name="enable_cmas_presidential_alerts_title" msgid="7293800023375154256">"התרעות נשיאותיות"</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>
     <string name="receive_cmas_in_second_language_summary" msgid="7704105502782770718"></string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 826d57b..82bba51 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -18,9 +18,14 @@
     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="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">"OK"</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>
     <string name="menu_view_details" msgid="1040989019045280975">"詳細を表示"</string>
@@ -52,10 +57,14 @@
     <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 設定は 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">"テキスト読み上げで緊急速報メールを読み上げる"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"エリア更新メッセージ"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 45e2189..5961192 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"პარამეტრები"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ქსელის შეტყობინებების წაშლა"</string>
     <string name="message_options" msgid="3178489901903589574">"შეტყობინების პარამეტრები"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"დეტალების ნახვა"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"გაფრთხილებები"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast შეტყობინებები"</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 პარამეტრების ავტომატური ცვლილებები 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">"უსადენო საგანგებო გაფრთხილებების შეტყობინებებზე ტექსტის გახმოვანების ფუნქციის გამოყენება"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"მდებარეობაზე მორგებული განახლებების მიღება"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c6cdc63..2bfe540 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"Параметрлер"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Таратылымдарды жою"</string>
     <string name="message_options" msgid="3178489901903589574">"Хабар опциялары"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Мәліметтерді көру"</string>
@@ -52,10 +57,14 @@
     <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 параметрлеріне 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">"Төтенше жағдай туралы сымсыз хабарландыруларды дыбыстау үшін мәтін дыбыстау функциясын пайдаланыңыз."</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Жергілікті жаңартылған ақпаратты тарату"</string>
@@ -125,8 +141,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>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index e045944..506e7a5 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"ការ​កំណត់"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"លុប​ការ​ផ្សាយ"</string>
     <string name="message_options" msgid="3178489901903589574">"ជម្រើស​សារ"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"មើល​​ព័ត៌មាន​លម្អិត"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ការផ្សាយបច្ចុប្បន្នភាពតំបន់"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index ba12478..6ad18af 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ಪ್ರಸಾರಗಳನ್ನು ಅಳಿಸಿ"</string>
     <string name="message_options" msgid="3178489901903589574">"ಸಂದೇಶದ ಆಯ್ಕೆಗಳು"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"ವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
@@ -52,10 +57,14 @@
     <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">"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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ಪ್ರದೇಶ ಅಪ್‌ಡೇಟ್‌ ಪ್ರಸಾರಗಳು"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 16386bb..4774e0c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"설정"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"브로드캐스트 삭제"</string>
     <string name="message_options" msgid="3178489901903589574">"메시지 옵션"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"세부정보 보기"</string>
@@ -52,10 +57,14 @@
     <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">"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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"지역 업데이트 방송"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c347359..290d7e9 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -18,9 +18,14 @@
     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="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">"OK"</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>
     <string name="menu_view_details" msgid="1040989019045280975">"Дайындарды көрүү"</string>
@@ -52,10 +57,14 @@
     <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 жөндөөлөрү 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">"Шашылыш билдирүүнү угуу үчүн кеп синтезаторун колдонуңуз"</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>
@@ -77,7 +86,14 @@
     <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>
+    <!-- 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_summary" msgid="4733669825477146614"></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>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index acb0e00..f02999f 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"ການຕັ້ງຄ່າ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ລຶບການແຈ້ງເຕືອນ"</string>
     <string name="message_options" msgid="3178489901903589574">"ໂຕເລືອກຂໍ້ຄວາມ"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"ເບິ່ງລາຍລະອຽດ"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ການປະກາດອັບເດດພື້ນທີ່"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d8a85a5..d40b5ee 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Kritinės padėties įspėjimai"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informacinis pranešimas"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Šis naudotojas negali pasiekti belaidžiu ryšiu siunčiamų įspėjimų nustatymų"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Gerai"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nėra ankstesnių įspėjimų"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Nustatymai"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Ištrinti transliacijas"</string>
     <string name="message_options" msgid="3178489901903589574">"Pranešimo parinktys"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Žiūrėti išsamią informaciją"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Įspėjimai"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Transliacijos pranešimai"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Nepaprastosios padėties įspėjimai"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nepatvirtinti įspėjimai apie kritinę padėtį"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Įspėjimai apie kritinę padėtį atliekant balso skambučius"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automatiniai bel. ryšiu siunč. kritinės padėties įsp. nustat. pakeitimai atsižvelgiant į SIM kortelę"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Leisti įspėjimus"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Gaukite belaidžiu ryšiu siunč. krit. pad. įspėjimus"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Įspėjimo priminimas"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Pasakyti įspėjimo pranešimą"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Naud. teksto į kalbą funk., kad būtų ištariami belaidžiu ryšiu siunčiami kritinės padėties įspėjimai"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Priminimo garsas bus leidžiamas įprastu garsumu"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Nepaprastosios padėties įspėjimų ist."</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Įspėjimų nuostatos"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Įspėti apie gyvybei grėsmingus įvykius"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Bandomieji įspėjimai"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Gauti operatoriaus testus ir mėnesinius testus iš saugos įspėjimų sistemos"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Gaukite kritinės padėties įspėjimą: mokomasis pranešimas"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Gaukite kritinės padėties įspėjimą: nustatyta operatoriaus"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibravimas"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Visada įspėti visu garsumu"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignoruoti netrukdymo režimą ir kitus garsumo nustatymus"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Srities atnaujinimo transliacija"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimalus laukimo laikas:"</string>
     <string name="seconds" msgid="141450721520515025">"sekundės"</string>
     <string name="message_copied" msgid="6922953753733166675">"Pranešimas nukopijuotas"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Operatoriaus pakeisti nustatymai"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Palieskite, kad peržiūrėtumėte belaidžiu ryšiu siunčiamų kritinės padėties įspėjimų nustatymus"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f7eb1b7..211f087 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Bezvadu ārkārtas brīdinājumi"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Bezvadu ārkārtas brīdinājumi"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Bezvadu ārkārtas brīdinājumi"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Bezvadu ārkārtas brīdinājumi"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Bezvadu ārkārtas brīdinājumi"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informatīvs paziņojums"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Bezvadu ārkārtas brīdinājumu iestatījumi nav pieejami šim lietotājam."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Labi"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nav bijis neviena brīdinājuma"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Iestatījumi"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Dzēst apraides"</string>
     <string name="message_options" msgid="3178489901903589574">"Ziņojumu opcijas"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Skatīt informāciju"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Brīdinājumi"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Apraides ziņojumi"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Ārkārtas brīdinājumi"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Neapstiprināti ārkārtas brīdinājumi"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Ārkārtas brīdinājumi balss zvana laikā"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Automātiskas WEA iestatījumu izmaiņas, pamatojoties uz SIM karti"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Brīdinājumu saņemšana"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Saņemt bezvadu ārkārtas brīdinājumu paziņojumus"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Atgādinājums ar signālu"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ierunāt brīdinājuma ziņojumu"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Izmantot teksta pārvēršanu runā, lai izveidotu bezvadu ārkārtas brīdinājumu ziņojumus"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Atgādinājuma skaņas signāls tiks atskaņots parastā skaļumā"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Ārkārtas situāciju brīdinājumi"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Brīdinājumu preferences"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Brīdināt par dzīvību apdraudošiem notikumiem"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Pārbaudes brīdinājumi"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Saņemt mobilo sakaru operatora testus un ikmēneša testus no drošības brīdinājumu sistēmas"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Saņemt ārkārtas brīdinājumu: vingrināšanās ziņojumu"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Saņemt ārkārtas brīdinājumu (operators definēts)"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrācija"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Vienmēr atskaņot brīdinājuma signālu pilnā skaļumā"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorēt režīmu “Netraucēt” un citus skaļuma iestatījumus"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Apgabala atjauninājumu apraide"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimālais gaidīšanas laiks:"</string>
     <string name="seconds" msgid="141450721520515025">"sekundes"</string>
     <string name="message_copied" msgid="6922953753733166675">"Ziņojums nokopēts"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Iestatījumi, ko mainījis mobilo sakaru operators"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Pieskarieties, lai skatītu bezvadu ārkārtas brīdinājumu iestatījumus."</string>
 </resources>
diff --git a/res/values-mcc001-af/config.xml b/res/values-mcc001-af/config.xml
new file mode 100644
index 0000000..e464b3b
--- /dev/null
+++ b/res/values-mcc001-af/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Ander toetse"</string>
+</resources>
diff --git a/res/values-mcc001-am/config.xml b/res/values-mcc001-am/config.xml
new file mode 100644
index 0000000..6dbb0ce
--- /dev/null
+++ b/res/values-mcc001-am/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"ሌሎች ሙከራዎች"</string>
+</resources>
diff --git a/res/values-mcc001-ar/config.xml b/res/values-mcc001-ar/config.xml
new file mode 100644
index 0000000..e65d29f
--- /dev/null
+++ b/res/values-mcc001-ar/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"الاختبارات الأخرى"</string>
+</resources>
diff --git a/res/values-mcc001-as/config.xml b/res/values-mcc001-as/config.xml
new file mode 100644
index 0000000..c0330d0
--- /dev/null
+++ b/res/values-mcc001-as/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"অন্য পৰীক্ষাসমূহ"</string>
+</resources>
diff --git a/res/values-mcc001-az/config.xml b/res/values-mcc001-az/config.xml
new file mode 100644
index 0000000..c1d6ad7
--- /dev/null
+++ b/res/values-mcc001-az/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Digər sınaqlar"</string>
+</resources>
diff --git a/res/values-mcc001-b+sr+Latn/config.xml b/res/values-mcc001-b+sr+Latn/config.xml
new file mode 100644
index 0000000..b301505
--- /dev/null
+++ b/res/values-mcc001-b+sr+Latn/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Drugi testovi"</string>
+</resources>
diff --git a/res/values-mcc001-be/config.xml b/res/values-mcc001-be/config.xml
new file mode 100644
index 0000000..dcbf6fe
--- /dev/null
+++ b/res/values-mcc001-be/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Іншыя тэсты"</string>
+</resources>
diff --git a/res/values-mcc001-bg/config.xml b/res/values-mcc001-bg/config.xml
new file mode 100644
index 0000000..0c741cf
--- /dev/null
+++ b/res/values-mcc001-bg/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Други тестове"</string>
+</resources>
diff --git a/res/values-mcc001-bn/config.xml b/res/values-mcc001-bn/config.xml
new file mode 100644
index 0000000..4b9e337
--- /dev/null
+++ b/res/values-mcc001-bn/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"অন্য পরীক্ষা"</string>
+</resources>
diff --git a/res/values-mcc001-bs/config.xml b/res/values-mcc001-bs/config.xml
new file mode 100644
index 0000000..b301505
--- /dev/null
+++ b/res/values-mcc001-bs/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Drugi testovi"</string>
+</resources>
diff --git a/res/values-mcc001-ca/config.xml b/res/values-mcc001-ca/config.xml
new file mode 100644
index 0000000..2e8acef
--- /dev/null
+++ b/res/values-mcc001-ca/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Altres proves"</string>
+</resources>
diff --git a/res/values-mcc001-cs/config.xml b/res/values-mcc001-cs/config.xml
new file mode 100644
index 0000000..06a74ff
--- /dev/null
+++ b/res/values-mcc001-cs/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Jiné testy"</string>
+</resources>
diff --git a/res/values-mcc001-da/config.xml b/res/values-mcc001-da/config.xml
new file mode 100644
index 0000000..da175c8
--- /dev/null
+++ b/res/values-mcc001-da/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Andre test"</string>
+</resources>
diff --git a/res/values-mcc001-de/config.xml b/res/values-mcc001-de/config.xml
new file mode 100644
index 0000000..9c7f1a9
--- /dev/null
+++ b/res/values-mcc001-de/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Andere Tests"</string>
+</resources>
diff --git a/res/values-mcc001-el/config.xml b/res/values-mcc001-el/config.xml
new file mode 100644
index 0000000..5d175e1
--- /dev/null
+++ b/res/values-mcc001-el/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Άλλες δοκιμές"</string>
+</resources>
diff --git a/res/values-mcc001-en-rAU/config.xml b/res/values-mcc001-en-rAU/config.xml
new file mode 100644
index 0000000..77bd56d
--- /dev/null
+++ b/res/values-mcc001-en-rAU/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Other tests"</string>
+</resources>
diff --git a/res/values-mcc001-en-rCA/config.xml b/res/values-mcc001-en-rCA/config.xml
new file mode 100644
index 0000000..77bd56d
--- /dev/null
+++ b/res/values-mcc001-en-rCA/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Other tests"</string>
+</resources>
diff --git a/res/values-mcc001-en-rGB/config.xml b/res/values-mcc001-en-rGB/config.xml
new file mode 100644
index 0000000..77bd56d
--- /dev/null
+++ b/res/values-mcc001-en-rGB/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Other tests"</string>
+</resources>
diff --git a/res/values-mcc001-en-rIN/config.xml b/res/values-mcc001-en-rIN/config.xml
new file mode 100644
index 0000000..77bd56d
--- /dev/null
+++ b/res/values-mcc001-en-rIN/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Other tests"</string>
+</resources>
diff --git a/res/values-mcc001-en-rXC/config.xml b/res/values-mcc001-en-rXC/config.xml
new file mode 100644
index 0000000..5233b74
--- /dev/null
+++ b/res/values-mcc001-en-rXC/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎Other tests‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-mcc001-es-rUS/config.xml b/res/values-mcc001-es-rUS/config.xml
new file mode 100644
index 0000000..3bc3abf
--- /dev/null
+++ b/res/values-mcc001-es-rUS/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Otras pruebas"</string>
+</resources>
diff --git a/res/values-mcc001-es/config.xml b/res/values-mcc001-es/config.xml
new file mode 100644
index 0000000..3bc3abf
--- /dev/null
+++ b/res/values-mcc001-es/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Otras pruebas"</string>
+</resources>
diff --git a/res/values-mcc001-et/config.xml b/res/values-mcc001-et/config.xml
new file mode 100644
index 0000000..2832d84
--- /dev/null
+++ b/res/values-mcc001-et/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Muud testid"</string>
+</resources>
diff --git a/res/values-mcc001-eu/config.xml b/res/values-mcc001-eu/config.xml
new file mode 100644
index 0000000..96b70f4
--- /dev/null
+++ b/res/values-mcc001-eu/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Beste proba batzuk"</string>
+</resources>
diff --git a/res/values-mcc001-fa/config.xml b/res/values-mcc001-fa/config.xml
new file mode 100644
index 0000000..ee54161
--- /dev/null
+++ b/res/values-mcc001-fa/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"آزمایش‌های دیگر"</string>
+</resources>
diff --git a/res/values-mcc001-fi/config.xml b/res/values-mcc001-fi/config.xml
new file mode 100644
index 0000000..f40fc88
--- /dev/null
+++ b/res/values-mcc001-fi/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Muut testit"</string>
+</resources>
diff --git a/res/values-mcc001-fr-rCA/config.xml b/res/values-mcc001-fr-rCA/config.xml
new file mode 100644
index 0000000..db2ac57
--- /dev/null
+++ b/res/values-mcc001-fr-rCA/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Autres tests"</string>
+</resources>
diff --git a/res/values-mcc001-fr/config.xml b/res/values-mcc001-fr/config.xml
new file mode 100644
index 0000000..db2ac57
--- /dev/null
+++ b/res/values-mcc001-fr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Autres tests"</string>
+</resources>
diff --git a/res/values-mcc001-gl/config.xml b/res/values-mcc001-gl/config.xml
new file mode 100644
index 0000000..c7e425c
--- /dev/null
+++ b/res/values-mcc001-gl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Outras probas"</string>
+</resources>
diff --git a/res/values-mcc001-gu/config.xml b/res/values-mcc001-gu/config.xml
new file mode 100644
index 0000000..1371f80
--- /dev/null
+++ b/res/values-mcc001-gu/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"અન્ય પરીક્ષણો"</string>
+</resources>
diff --git a/res/values-mcc001-hr/config.xml b/res/values-mcc001-hr/config.xml
new file mode 100644
index 0000000..b301505
--- /dev/null
+++ b/res/values-mcc001-hr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Drugi testovi"</string>
+</resources>
diff --git a/res/values-mcc001-hu/config.xml b/res/values-mcc001-hu/config.xml
new file mode 100644
index 0000000..24e778f
--- /dev/null
+++ b/res/values-mcc001-hu/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Egyéb tesztek"</string>
+</resources>
diff --git a/res/values-mcc001-hy/config.xml b/res/values-mcc001-hy/config.xml
new file mode 100644
index 0000000..f28d500
--- /dev/null
+++ b/res/values-mcc001-hy/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Այլ փորձնական ծանուցումներ"</string>
+</resources>
diff --git a/res/values-mcc001-in/config.xml b/res/values-mcc001-in/config.xml
new file mode 100644
index 0000000..87cb955
--- /dev/null
+++ b/res/values-mcc001-in/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Pengujian lainnya"</string>
+</resources>
diff --git a/res/values-mcc001-is/config.xml b/res/values-mcc001-is/config.xml
new file mode 100644
index 0000000..1fddda4
--- /dev/null
+++ b/res/values-mcc001-is/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Aðrar prófanir"</string>
+</resources>
diff --git a/res/values-mcc001-it/config.xml b/res/values-mcc001-it/config.xml
new file mode 100644
index 0000000..5a328fd
--- /dev/null
+++ b/res/values-mcc001-it/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Altri test"</string>
+</resources>
diff --git a/res/values-mcc001-iw/config.xml b/res/values-mcc001-iw/config.xml
new file mode 100644
index 0000000..7214719
--- /dev/null
+++ b/res/values-mcc001-iw/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"בדיקות אחרות"</string>
+</resources>
diff --git a/res/values-mcc001-ja/config.xml b/res/values-mcc001-ja/config.xml
new file mode 100644
index 0000000..1edfa22
--- /dev/null
+++ b/res/values-mcc001-ja/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"その他のテスト"</string>
+</resources>
diff --git a/res/values-mcc001-ka/config.xml b/res/values-mcc001-ka/config.xml
new file mode 100644
index 0000000..ab3c66c
--- /dev/null
+++ b/res/values-mcc001-ka/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"სხვა ტესტები"</string>
+</resources>
diff --git a/res/values-mcc001-kk/config.xml b/res/values-mcc001-kk/config.xml
new file mode 100644
index 0000000..8207efd
--- /dev/null
+++ b/res/values-mcc001-kk/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Басқа сынақ ескертулері"</string>
+</resources>
diff --git a/res/values-mcc001-km/config.xml b/res/values-mcc001-km/config.xml
new file mode 100644
index 0000000..9e6d2c2
--- /dev/null
+++ b/res/values-mcc001-km/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"ការសាកល្បង​ផ្សេងទៀត"</string>
+</resources>
diff --git a/res/values-mcc001-kn/config.xml b/res/values-mcc001-kn/config.xml
new file mode 100644
index 0000000..af85c9e
--- /dev/null
+++ b/res/values-mcc001-kn/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"ಇತರ ಪರೀಕ್ಷೆಗಳು"</string>
+</resources>
diff --git a/res/values-mcc001-ko/config.xml b/res/values-mcc001-ko/config.xml
new file mode 100644
index 0000000..265b0dc
--- /dev/null
+++ b/res/values-mcc001-ko/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"기타 테스트"</string>
+</resources>
diff --git a/res/values-mcc001-ky/config.xml b/res/values-mcc001-ky/config.xml
new file mode 100644
index 0000000..5f597e8
--- /dev/null
+++ b/res/values-mcc001-ky/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Башка сыноолор"</string>
+</resources>
diff --git a/res/values-mcc001-lo/config.xml b/res/values-mcc001-lo/config.xml
new file mode 100644
index 0000000..5fc33fc
--- /dev/null
+++ b/res/values-mcc001-lo/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"ການທົດສອບອື່ນໆ"</string>
+</resources>
diff --git a/res/values-mcc001-lt/config.xml b/res/values-mcc001-lt/config.xml
new file mode 100644
index 0000000..10b97f7
--- /dev/null
+++ b/res/values-mcc001-lt/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Kiti bandymai"</string>
+</resources>
diff --git a/res/values-mcc001-lv/config.xml b/res/values-mcc001-lv/config.xml
new file mode 100644
index 0000000..a603b49
--- /dev/null
+++ b/res/values-mcc001-lv/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Citi testi"</string>
+</resources>
diff --git a/res/values-mcc001-mk/config.xml b/res/values-mcc001-mk/config.xml
new file mode 100644
index 0000000..b99f48c
--- /dev/null
+++ b/res/values-mcc001-mk/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Други пробни предупредувања"</string>
+</resources>
diff --git a/res/values-mcc001-ml/config.xml b/res/values-mcc001-ml/config.xml
new file mode 100644
index 0000000..9062ed1
--- /dev/null
+++ b/res/values-mcc001-ml/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"മറ്റ് പരിശോധനകൾ"</string>
+</resources>
diff --git a/res/values-mcc001-mn/config.xml b/res/values-mcc001-mn/config.xml
new file mode 100644
index 0000000..976ca13
--- /dev/null
+++ b/res/values-mcc001-mn/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Бусад туршилт"</string>
+</resources>
diff --git a/res/values-mcc001-ms/config.xml b/res/values-mcc001-ms/config.xml
new file mode 100644
index 0000000..3776e9d
--- /dev/null
+++ b/res/values-mcc001-ms/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Ujian lain"</string>
+</resources>
diff --git a/res/values-mcc001-my/config.xml b/res/values-mcc001-my/config.xml
new file mode 100644
index 0000000..83061e2
--- /dev/null
+++ b/res/values-mcc001-my/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"အခြားစမ်းသပ်မှုများ"</string>
+</resources>
diff --git a/res/values-mcc001-nb/config.xml b/res/values-mcc001-nb/config.xml
new file mode 100644
index 0000000..fa02613
--- /dev/null
+++ b/res/values-mcc001-nb/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Andre tester"</string>
+</resources>
diff --git a/res/values-mcc001-ne/config.xml b/res/values-mcc001-ne/config.xml
new file mode 100644
index 0000000..2c42c41
--- /dev/null
+++ b/res/values-mcc001-ne/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"अन्य परीक्षणहरू"</string>
+</resources>
diff --git a/res/values-mcc001-nl/config.xml b/res/values-mcc001-nl/config.xml
new file mode 100644
index 0000000..5a9b6c3
--- /dev/null
+++ b/res/values-mcc001-nl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Andere tests"</string>
+</resources>
diff --git a/res/values-mcc001-or/config.xml b/res/values-mcc001-or/config.xml
new file mode 100644
index 0000000..3de2cb2
--- /dev/null
+++ b/res/values-mcc001-or/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"ଅନ୍ୟ ପରୀକ୍ଷାଗୁଡ଼ିକ"</string>
+</resources>
diff --git a/res/values-mcc001-pl/config.xml b/res/values-mcc001-pl/config.xml
new file mode 100644
index 0000000..a4a46cc
--- /dev/null
+++ b/res/values-mcc001-pl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Inne testy"</string>
+</resources>
diff --git a/res/values-mcc001-pt-rPT/config.xml b/res/values-mcc001-pt-rPT/config.xml
new file mode 100644
index 0000000..a07f722
--- /dev/null
+++ b/res/values-mcc001-pt-rPT/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Outros testes"</string>
+</resources>
diff --git a/res/values-mcc001-pt/config.xml b/res/values-mcc001-pt/config.xml
new file mode 100644
index 0000000..a07f722
--- /dev/null
+++ b/res/values-mcc001-pt/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Outros testes"</string>
+</resources>
diff --git a/res/values-mcc001-ro/config.xml b/res/values-mcc001-ro/config.xml
new file mode 100644
index 0000000..b88b00f
--- /dev/null
+++ b/res/values-mcc001-ro/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Alte teste"</string>
+</resources>
diff --git a/res/values-mcc001-ru/config.xml b/res/values-mcc001-ru/config.xml
new file mode 100644
index 0000000..cd38d1a
--- /dev/null
+++ b/res/values-mcc001-ru/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Другие тестовые оповещения"</string>
+</resources>
diff --git a/res/values-mcc001-si/config.xml b/res/values-mcc001-si/config.xml
new file mode 100644
index 0000000..0ea46ea
--- /dev/null
+++ b/res/values-mcc001-si/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"වෙනත් පරීක්ෂා"</string>
+</resources>
diff --git a/res/values-mcc001-sk/config.xml b/res/values-mcc001-sk/config.xml
new file mode 100644
index 0000000..968f44c
--- /dev/null
+++ b/res/values-mcc001-sk/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Iné testy"</string>
+</resources>
diff --git a/res/values-mcc001-sl/config.xml b/res/values-mcc001-sl/config.xml
new file mode 100644
index 0000000..99e1a2d
--- /dev/null
+++ b/res/values-mcc001-sl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Drugi preizkusi"</string>
+</resources>
diff --git a/res/values-mcc001-sq/config.xml b/res/values-mcc001-sq/config.xml
new file mode 100644
index 0000000..42d7e1c
--- /dev/null
+++ b/res/values-mcc001-sq/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Testet e tjera"</string>
+</resources>
diff --git a/res/values-mcc001-sr/config.xml b/res/values-mcc001-sr/config.xml
new file mode 100644
index 0000000..810e07a
--- /dev/null
+++ b/res/values-mcc001-sr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Други тестови"</string>
+</resources>
diff --git a/res/values-mcc001-sv/config.xml b/res/values-mcc001-sv/config.xml
new file mode 100644
index 0000000..6a76327
--- /dev/null
+++ b/res/values-mcc001-sv/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Andra tester"</string>
+</resources>
diff --git a/res/values-mcc001-sw/config.xml b/res/values-mcc001-sw/config.xml
new file mode 100644
index 0000000..3fd6bd4
--- /dev/null
+++ b/res/values-mcc001-sw/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Majaribio mengine"</string>
+</resources>
diff --git a/res/values-mcc001-ta/config.xml b/res/values-mcc001-ta/config.xml
new file mode 100644
index 0000000..9a641fb
--- /dev/null
+++ b/res/values-mcc001-ta/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"பிற சோதனைகள்"</string>
+</resources>
diff --git a/res/values-mcc001-te/config.xml b/res/values-mcc001-te/config.xml
new file mode 100644
index 0000000..cf2c87e
--- /dev/null
+++ b/res/values-mcc001-te/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"ఇతర పరీక్షలు"</string>
+</resources>
diff --git a/res/values-mcc001-th/config.xml b/res/values-mcc001-th/config.xml
new file mode 100644
index 0000000..a1d4f42
--- /dev/null
+++ b/res/values-mcc001-th/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"การทดสอบอื่นๆ"</string>
+</resources>
diff --git a/res/values-mcc001-tl/config.xml b/res/values-mcc001-tl/config.xml
new file mode 100644
index 0000000..193ac1d
--- /dev/null
+++ b/res/values-mcc001-tl/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Iba pang pagsubok"</string>
+</resources>
diff --git a/res/values-mcc001-tr/config.xml b/res/values-mcc001-tr/config.xml
new file mode 100644
index 0000000..f37c77c
--- /dev/null
+++ b/res/values-mcc001-tr/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Diğer testler"</string>
+</resources>
diff --git a/res/values-mcc001-uk/config.xml b/res/values-mcc001-uk/config.xml
new file mode 100644
index 0000000..c54c9a8
--- /dev/null
+++ b/res/values-mcc001-uk/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Інші тести"</string>
+</resources>
diff --git a/res/values-mcc001-ur/config.xml b/res/values-mcc001-ur/config.xml
new file mode 100644
index 0000000..c6a63d5
--- /dev/null
+++ b/res/values-mcc001-ur/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"دیگر ٹیسٹس"</string>
+</resources>
diff --git a/res/values-mcc001-uz/config.xml b/res/values-mcc001-uz/config.xml
new file mode 100644
index 0000000..3fcbc5a
--- /dev/null
+++ b/res/values-mcc001-uz/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Boshqa sinov xabarlari"</string>
+</resources>
diff --git a/res/values-mcc001-vi/config.xml b/res/values-mcc001-vi/config.xml
new file mode 100644
index 0000000..515a1c9
--- /dev/null
+++ b/res/values-mcc001-vi/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Các cảnh báo kiểm tra khác"</string>
+</resources>
diff --git a/res/values-mcc001-zh-rCN/config.xml b/res/values-mcc001-zh-rCN/config.xml
new file mode 100644
index 0000000..3938ff6
--- /dev/null
+++ b/res/values-mcc001-zh-rCN/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"其他测试"</string>
+</resources>
diff --git a/res/values-mcc001-zh-rHK/config.xml b/res/values-mcc001-zh-rHK/config.xml
new file mode 100644
index 0000000..4af659c
--- /dev/null
+++ b/res/values-mcc001-zh-rHK/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"其他測試"</string>
+</resources>
diff --git a/res/values-mcc001-zh-rTW/config.xml b/res/values-mcc001-zh-rTW/config.xml
new file mode 100644
index 0000000..4af659c
--- /dev/null
+++ b/res/values-mcc001-zh-rTW/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"其他測試"</string>
+</resources>
diff --git a/res/values-mcc001-zu/config.xml b/res/values-mcc001-zu/config.xml
new file mode 100644
index 0000000..4c5a35a
--- /dev/null
+++ b/res/values-mcc001-zu/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_test_alerts_title" msgid="7552567512178490413">"Okunye ukuhlolwa"</string>
+</resources>
diff --git a/res/values-mcc001/config.xml b/res/values-mcc001/config.xml
index aafd6f4..a057eab 100644
--- a/res/values-mcc001/config.xml
+++ b/res/values-mcc001/config.xml
@@ -24,10 +24,10 @@
     <string name="emergency_alert_second_language_code" translatable="false">es</string>
     <!-- 4370, 4383 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true</item>
-        <item>0x1000:rat=cdma, emergency=true</item>
+        <item>0x1112:rat=gsm, emergency=true, always_on=true</item>
+        <item>0x1000:rat=cdma, emergency=true, always_on=true</item>
         <!-- additional language -->
-        <item>0x111F:rat=gsm, emergency=true, filter_language=true</item>
+        <item>0x111F:rat=gsm, emergency=true, filter_language=true, always_on=true</item>
     </string-array>
     <!-- 4371~4372, 4384~4385 -->
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
@@ -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-zh-rHK/strings.xml b/res/values-mcc202-zh-rHK/strings.xml
index 45f40e7..3e400dc 100644
--- a/res/values-mcc202-zh-rHK/strings.xml
+++ b/res/values-mcc202-zh-rHK/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">"希臘警示:安珀警報"</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>
diff --git a/res/values-mcc202/config.xml b/res/values-mcc202/config.xml
index ce62b36..86b3200 100644
--- a/res/values-mcc202/config.xml
+++ b/res/values-mcc202/config.xml
@@ -17,7 +17,7 @@
 <resources>
     <!-- 4370 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true</item>
+        <item>0x1112:rat=gsm, emergency=true, always_on=true</item>
     </string-array>
     <!-- 4371 -->
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
diff --git a/res/values-mcc204-zh-rHK/strings.xml b/res/values-mcc204-zh-rHK/strings.xml
index 34c730d..34de880 100644
--- a/res/values-mcc204-zh-rHK/strings.xml
+++ b/res/values-mcc204-zh-rHK/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="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_likely_alert" msgid="207796247208986943">"荷蘭極嚴重警報"</string>
-    <string name="cmas_severe_alert" msgid="26776277057772591">"荷蘭極嚴重警報"</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_likely_alert" msgid="207796247208986943">"荷蘭極嚴重警示"</string>
+    <string name="cmas_severe_alert" msgid="26776277057772591">"荷蘭極嚴重警示"</string>
 </resources>
diff --git a/res/values-mcc216-mnc30/config.xml b/res/values-mcc216-mnc30/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc216-mnc30/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc219-mnc01/config.xml b/res/values-mcc219-mnc01/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc219-mnc01/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc222-af/strings.xml b/res/values-mcc222-af/strings.xml
index 4d15281..6ceaa56 100644
--- a/res/values-mcc222-af/strings.xml
+++ b/res/values-mcc222-af/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-waarskuwing"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Publieke waarskuwings"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Kritieke boodskappe kan deurkom ongeag wat die gebruikerinstellings is"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Toetsboodskappe"</string>
 </resources>
diff --git a/res/values-mcc222-am/strings.xml b/res/values-mcc222-am/strings.xml
index 1cdbc3c..3b67c43 100644
--- a/res/values-mcc222-am/strings.xml
+++ b/res/values-mcc222-am/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="cmas_presidential_level_alert" msgid="2884179444895260284">"አይቲ ማንቂያ"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"ይፋዊ ማስጠንቀቂያዎች"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-ar/strings.xml b/res/values-mcc222-ar/strings.xml
index d432425..679142c 100644
--- a/res/values-mcc222-ar/strings.xml
+++ b/res/values-mcc222-ar/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="cmas_presidential_level_alert" msgid="2884179444895260284">"‏تنبيه IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"تحذيرات عامة"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-as/strings.xml b/res/values-mcc222-as/strings.xml
index e2fad0d..3d71d0e 100644
--- a/res/values-mcc222-as/strings.xml
+++ b/res/values-mcc222-as/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="cmas_presidential_level_alert" msgid="2884179444895260284">"আইটি-সতর্কবার্তা"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"ৰাজহুৱা সকীয়নি"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-az/strings.xml b/res/values-mcc222-az/strings.xml
index 3808be1..4955101 100644
--- a/res/values-mcc222-az/strings.xml
+++ b/res/values-mcc222-az/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT siqnalı"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"İctimai xəbərdarlıqlar"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"İstifadəçi ayarlarından asılı olmayaraq kritik mesajlar gələ bilər"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Test mesajları"</string>
 </resources>
diff --git a/res/values-mcc222-b+sr+Latn/strings.xml b/res/values-mcc222-b+sr+Latn/strings.xml
index e8a296c..13b449a 100644
--- a/res/values-mcc222-b+sr+Latn/strings.xml
+++ b/res/values-mcc222-b+sr+Latn/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Upozorenje italijanske vlade"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Javna upozorenja"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Korisnici će dobijati važne poruke bez obzira na podešavanja"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Probne poruke"</string>
 </resources>
diff --git a/res/values-mcc222-be/strings.xml b/res/values-mcc222-be/strings.xml
index fada61f..f3157e7 100644
--- a/res/values-mcc222-be/strings.xml
+++ b/res/values-mcc222-be/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="cmas_presidential_level_alert" msgid="2884179444895260284">"ІТ-абвестка"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Папярэджанні насельніцтва"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-bg/strings.xml b/res/values-mcc222-bg/strings.xml
index 2910d27..1607e0a 100644
--- a/res/values-mcc222-bg/strings.xml
+++ b/res/values-mcc222-bg/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="cmas_presidential_level_alert" msgid="2884179444895260284">"ИТ сигнал"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Публични предупреждения"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-bn/strings.xml b/res/values-mcc222-bn/strings.xml
index 65eb09a..6fe5420 100644
--- a/res/values-mcc222-bn/strings.xml
+++ b/res/values-mcc222-bn/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-সতর্কতা"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"সর্বজনীন সতর্কতা"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-bs/strings.xml b/res/values-mcc222-bs/strings.xml
index 6d5e8c9..393f609 100644
--- a/res/values-mcc222-bs/strings.xml
+++ b/res/values-mcc222-bs/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Upozorenje talijanske vlade"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Javna upozorenja"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Kritične poruke mogu proći bez obzira na postavke korisnika"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Probne poruke"</string>
 </resources>
diff --git a/res/values-mcc222-ca/strings.xml b/res/values-mcc222-ca/strings.xml
index 5758712..edc689a 100644
--- a/res/values-mcc222-ca/strings.xml
+++ b/res/values-mcc222-ca/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Advertiments públics"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"És possible que rebis els missatges crítics independentment de la configuració d\'usuari"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Missatges de prova"</string>
 </resources>
diff --git a/res/values-mcc222-cs/strings.xml b/res/values-mcc222-cs/strings.xml
index ec3ed87..5be8b95 100644
--- a/res/values-mcc222-cs/strings.xml
+++ b/res/values-mcc222-cs/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Výstraha IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Veřejná upozornění"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Kritické zprávy se mohou zobrazit bez ohledu na nastavení uživatele"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testovací zprávy"</string>
 </resources>
diff --git a/res/values-mcc222-da/strings.xml b/res/values-mcc222-da/strings.xml
index 306646a..26bf7ff 100644
--- a/res/values-mcc222-da/strings.xml
+++ b/res/values-mcc222-da/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="cmas_presidential_level_alert" msgid="2884179444895260284">"National alarm"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Advarsler fra myndighederne"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Du modtager muligvis kritiske beskeder, uanset hvilke brugerindstillinger du har valgt"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testmeddelelse"</string>
 </resources>
diff --git a/res/values-mcc222-de/strings.xml b/res/values-mcc222-de/strings.xml
index 5be9555..c73da41 100644
--- a/res/values-mcc222-de/strings.xml
+++ b/res/values-mcc222-de/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Warnung"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Öffentliche Warnungen"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Du erhältst alle wichtigen Nachrichten, ungeachtet deiner Einstellungen"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testnachrichten"</string>
 </resources>
diff --git a/res/values-mcc222-el/strings.xml b/res/values-mcc222-el/strings.xml
index 7f91efa..54cb60e 100644
--- a/res/values-mcc222-el/strings.xml
+++ b/res/values-mcc222-el/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Ειδοποίηση IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Δημόσιες ειδοποιήσεις"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-en-rAU/strings.xml b/res/values-mcc222-en-rAU/strings.xml
index 565df62..5b90e29 100644
--- a/res/values-mcc222-en-rAU/strings.xml
+++ b/res/values-mcc222-en-rAU/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Public warnings"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Critical messages may come through, regardless of user settings"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Test messages"</string>
 </resources>
diff --git a/res/values-mcc222-en-rCA/strings.xml b/res/values-mcc222-en-rCA/strings.xml
index 565df62..5b90e29 100644
--- a/res/values-mcc222-en-rCA/strings.xml
+++ b/res/values-mcc222-en-rCA/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Public warnings"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Critical messages may come through, regardless of user settings"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Test messages"</string>
 </resources>
diff --git a/res/values-mcc222-en-rGB/strings.xml b/res/values-mcc222-en-rGB/strings.xml
index 565df62..5b90e29 100644
--- a/res/values-mcc222-en-rGB/strings.xml
+++ b/res/values-mcc222-en-rGB/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Public warnings"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Critical messages may come through, regardless of user settings"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Test messages"</string>
 </resources>
diff --git a/res/values-mcc222-en-rIN/strings.xml b/res/values-mcc222-en-rIN/strings.xml
index 565df62..5b90e29 100644
--- a/res/values-mcc222-en-rIN/strings.xml
+++ b/res/values-mcc222-en-rIN/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Public warnings"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Critical messages may come through, regardless of user settings"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Test messages"</string>
 </resources>
diff --git a/res/values-mcc222-en-rXC/strings.xml b/res/values-mcc222-en-rXC/strings.xml
index edf2512..e323e95 100644
--- a/res/values-mcc222-en-rXC/strings.xml
+++ b/res/values-mcc222-en-rXC/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="cmas_presidential_level_alert" msgid="2884179444895260284">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎IT-Alert‎‏‎‎‏‎"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎Public warnings‎‏‎‎‏‎"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎Critical messages may come through regardless of user settings‎‏‎‎‏‎"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎Test messages‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-mcc222-es-rUS/strings.xml b/res/values-mcc222-es-rUS/strings.xml
index 5758712..42b3b32 100644
--- a/res/values-mcc222-es-rUS/strings.xml
+++ b/res/values-mcc222-es-rUS/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Advertencias públicas"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Es posible que se muestren mensajes importantes, independientemente de la configuración de usuario"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mensajes de prueba"</string>
 </resources>
diff --git a/res/values-mcc222-es/strings.xml b/res/values-mcc222-es/strings.xml
index 5758712..d63003c 100644
--- a/res/values-mcc222-es/strings.xml
+++ b/res/values-mcc222-es/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Advertencias públicas"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Quizá se reciban mensajes de vital importancia independientemente de los ajustes de usuario"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mensajes de prueba"</string>
 </resources>
diff --git a/res/values-mcc222-et/strings.xml b/res/values-mcc222-et/strings.xml
index eb2ec3e..589db67 100644
--- a/res/values-mcc222-et/strings.xml
+++ b/res/values-mcc222-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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-hoiatus"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Avalikud hoiatused"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Kriitilised sõnumid võidakse kuvada olenemata kasutaja seadetest"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testsõnumid"</string>
 </resources>
diff --git a/res/values-mcc222-eu/strings.xml b/res/values-mcc222-eu/strings.xml
index 605e505..e160e61 100644
--- a/res/values-mcc222-eu/strings.xml
+++ b/res/values-mcc222-eu/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IKT alerta"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Abisu publikoak"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Baliteke premiazko mezuak jasotzea, erabiltzailearen ezarpenak direnak direla ere"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testu-mezuak"</string>
 </resources>
diff --git a/res/values-mcc222-fa/strings.xml b/res/values-mcc222-fa/strings.xml
index 35e72d4..baa345f 100644
--- a/res/values-mcc222-fa/strings.xml
+++ b/res/values-mcc222-fa/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="cmas_presidential_level_alert" msgid="2884179444895260284">"هشدار فناوری و اطلاعات"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"هشدارهای عمومی"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-fi/strings.xml b/res/values-mcc222-fi/strings.xml
index 7c56b97..9d36fcd 100644
--- a/res/values-mcc222-fi/strings.xml
+++ b/res/values-mcc222-fi/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-hälytys"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Yleiset varoitukset"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Kriittiset viestit voidaan toimittaa käyttäjän asetuksista riippumatta"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Koeviestit"</string>
 </resources>
diff --git a/res/values-mcc222-fr-rCA/strings.xml b/res/values-mcc222-fr-rCA/strings.xml
index 72e9c62..420f69e 100644
--- a/res/values-mcc222-fr-rCA/strings.xml
+++ b/res/values-mcc222-fr-rCA/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Alerte IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Avertissements publics"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Les messages d\'importance critique peuvent s\'afficher, indépendamment des paramètres que l\'utilisateur a définis"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Messages test"</string>
 </resources>
diff --git a/res/values-mcc222-fr/strings.xml b/res/values-mcc222-fr/strings.xml
index d8e0a08..b916926 100644
--- a/res/values-mcc222-fr/strings.xml
+++ b/res/values-mcc222-fr/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alerte"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Avertissements publics"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Il est possible que les messages d\'importance critique soient transmis, quels que soient les paramètres utilisateur"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Messages test"</string>
 </resources>
diff --git a/res/values-mcc222-gl/strings.xml b/res/values-mcc222-gl/strings.xml
index 215c15c..65d6baf 100644
--- a/res/values-mcc222-gl/strings.xml
+++ b/res/values-mcc222-gl/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Alerta de IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Advertencias públicas"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Poden recibirse mensaxes críticas independentemente da configuración do usuario"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mensaxes de proba"</string>
 </resources>
diff --git a/res/values-mcc222-gu/strings.xml b/res/values-mcc222-gu/strings.xml
index ba7a8e7..34bf039 100644
--- a/res/values-mcc222-gu/strings.xml
+++ b/res/values-mcc222-gu/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-અલર્ટ"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"સાર્વજનિક ચેતવણીઓ"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-hi/strings.xml b/res/values-mcc222-hi/strings.xml
index 5758712..fb57e6a 100644
--- a/res/values-mcc222-hi/strings.xml
+++ b/res/values-mcc222-hi/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"सार्वजनिक चेतावनियां"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-hr/strings.xml b/res/values-mcc222-hr/strings.xml
index a178ab0..d346205 100644
--- a/res/values-mcc222-hr/strings.xml
+++ b/res/values-mcc222-hr/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT upozorenje"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Javna upozorenja"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Kritične poruke mogu stizati bez obzira na korisničke postavke"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testne poruke"</string>
 </resources>
diff --git a/res/values-mcc222-hu/strings.xml b/res/values-mcc222-hu/strings.xml
index 5758712..6661d87 100644
--- a/res/values-mcc222-hu/strings.xml
+++ b/res/values-mcc222-hu/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Nyilvános figyelmeztetések"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"A fontos üzenetek a felhasználói beállításoktól függetlenül megérkezhetnek"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Tesztüzenetek"</string>
 </resources>
diff --git a/res/values-mcc222-hy/strings.xml b/res/values-mcc222-hy/strings.xml
index 5758712..c19267b 100644
--- a/res/values-mcc222-hy/strings.xml
+++ b/res/values-mcc222-hy/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Հանրային ազդարարում"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-in/strings.xml b/res/values-mcc222-in/strings.xml
index ba40b31..1134e81 100644
--- a/res/values-mcc222-in/strings.xml
+++ b/res/values-mcc222-in/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Peringatan IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Peringatan publik"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Pesan penting dapat muncul terlepas dari setelan pengguna"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Pesan pengujian"</string>
 </resources>
diff --git a/res/values-mcc222-is/strings.xml b/res/values-mcc222-is/strings.xml
index 67fd1fb..840850a 100644
--- a/res/values-mcc222-is/strings.xml
+++ b/res/values-mcc222-is/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-viðvörun"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Opinberar viðvaranir"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Mikilvæg skilaboð kunna að berast óháð stillingum notanda"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Prufuskilaboð"</string>
 </resources>
diff --git a/res/values-mcc222-it/strings.xml b/res/values-mcc222-it/strings.xml
index 620c363..fc992e7 100644
--- a/res/values-mcc222-it/strings.xml
+++ b/res/values-mcc222-it/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Avviso-IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Allarmi pubblici"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Messaggi di particolare rilevanza possono essere ricevuti indipendentemente dalle impostazioni dell’utente"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Messaggi di test"</string>
 </resources>
diff --git a/res/values-mcc222-iw/strings.xml b/res/values-mcc222-iw/strings.xml
index edf402e..5b0c708 100644
--- a/res/values-mcc222-iw/strings.xml
+++ b/res/values-mcc222-iw/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="cmas_presidential_level_alert" msgid="2884179444895260284">"‏התראת IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"אזהרות גלויות לכול"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-ja/strings.xml b/res/values-mcc222-ja/strings.xml
index 5758712..597d796 100644
--- a/res/values-mcc222-ja/strings.xml
+++ b/res/values-mcc222-ja/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"一般公開警告"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-ka/strings.xml b/res/values-mcc222-ka/strings.xml
index 373a15c..cc65eb7 100644
--- a/res/values-mcc222-ka/strings.xml
+++ b/res/values-mcc222-ka/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-გაფრთხილება"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"საჯარო გაფრთხილებები"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-kk/strings.xml b/res/values-mcc222-kk/strings.xml
index 5758712..b3289fd 100644
--- a/res/values-mcc222-kk/strings.xml
+++ b/res/values-mcc222-kk/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Жария ескертулер"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-km/strings.xml b/res/values-mcc222-km/strings.xml
index 41db5ae..a378eeb 100644
--- a/res/values-mcc222-km/strings.xml
+++ b/res/values-mcc222-km/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="cmas_presidential_level_alert" msgid="2884179444895260284">"ប្រព័ន្ធជូនដំណឹង​ពេលមានអាសន្ន​របស់​អ៊ីតាលី"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"ការព្រមាន​ជាសាធារណៈ"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-kn/strings.xml b/res/values-mcc222-kn/strings.xml
index 06eb875..8b7d0ef 100644
--- a/res/values-mcc222-kn/strings.xml
+++ b/res/values-mcc222-kn/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-ಎಚ್ಚರಿಕೆ"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"ಸಾರ್ವಜನಿಕ ಎಚ್ಚರಿಕೆಗಳು"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-ko/strings.xml b/res/values-mcc222-ko/strings.xml
index 2854674..be469d0 100644
--- a/res/values-mcc222-ko/strings.xml
+++ b/res/values-mcc222-ko/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT 알림"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"재난 경보"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-ky/strings.xml b/res/values-mcc222-ky/strings.xml
index d2609fe..8da2d55 100644
--- a/res/values-mcc222-ky/strings.xml
+++ b/res/values-mcc222-ky/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-шашылыш билдирүүсү"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Коомдук билдирүү"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-lo/strings.xml b/res/values-mcc222-lo/strings.xml
index 5758712..de47a53 100644
--- a/res/values-mcc222-lo/strings.xml
+++ b/res/values-mcc222-lo/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"ຄຳເຕືອນສາທາລະນະ"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-lt/strings.xml b/res/values-mcc222-lt/strings.xml
index 06bd174..3e35cf7 100644
--- a/res/values-mcc222-lt/strings.xml
+++ b/res/values-mcc222-lt/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT įspėjimas"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Vieši įspėjimai"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Svarbūs pranešimai bus gaunami nepaisant naudotojo nustatymų"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Bandomieji pranešimai"</string>
 </resources>
diff --git a/res/values-mcc222-lv/strings.xml b/res/values-mcc222-lv/strings.xml
index 252b6c4..5cb91e8 100644
--- a/res/values-mcc222-lv/strings.xml
+++ b/res/values-mcc222-lv/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT: valsts līmeņa brīdinājums"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Publiski brīdinājumi"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Svarīgi ziņojumi var tikt parādīti neatkarīgi no lietotāja iestatījumiem"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testa ziņojumi"</string>
 </resources>
diff --git a/res/values-mcc222-mk/strings.xml b/res/values-mcc222-mk/strings.xml
index fe452ec..d688552 100644
--- a/res/values-mcc222-mk/strings.xml
+++ b/res/values-mcc222-mk/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-предупредување"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Јавни предупредувања"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-ml/strings.xml b/res/values-mcc222-ml/strings.xml
index 51bcd49..8e07328 100644
--- a/res/values-mcc222-ml/strings.xml
+++ b/res/values-mcc222-ml/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="cmas_presidential_level_alert" msgid="2884179444895260284">"ഐടി മുന്നറിയിപ്പ്"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"പൊതു മുന്നറിയിപ്പുകൾ"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-mn/strings.xml b/res/values-mcc222-mn/strings.xml
index 70d5fbc..34aa922 100644
--- a/res/values-mcc222-mn/strings.xml
+++ b/res/values-mcc222-mn/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Сэрэмжлүүлэг"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Олон нийтийн сануулга"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-mr/strings.xml b/res/values-mcc222-mr/strings.xml
index b7ee0d6..bd79303 100644
--- a/res/values-mcc222-mr/strings.xml
+++ b/res/values-mcc222-mr/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="cmas_presidential_level_alert" msgid="2884179444895260284">"आयटी सूचना"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"सार्वजनिक चेतावण्या"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-ms/strings.xml b/res/values-mcc222-ms/strings.xml
index 82def80..32898f6 100644
--- a/res/values-mcc222-ms/strings.xml
+++ b/res/values-mcc222-ms/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Makluman"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Amaran umum"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Mesej kritikal mungkin masuk tanpa mengambil kira tetapan pengguna"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mesej ujian"</string>
 </resources>
diff --git a/res/values-mcc222-my/strings.xml b/res/values-mcc222-my/strings.xml
index 5758712..ba5b25d 100644
--- a/res/values-mcc222-my/strings.xml
+++ b/res/values-mcc222-my/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"အများပြည်သူအတွက် သတိပေးချက်များ"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-nb/strings.xml b/res/values-mcc222-nb/strings.xml
index 627e98e..d3eb6aa 100644
--- a/res/values-mcc222-nb/strings.xml
+++ b/res/values-mcc222-nb/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-varsel"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Offentlige advarsler"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Kritiske meldinger kan komme gjennom uavhengig av brukerinnstillinger"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testmeldinger"</string>
 </resources>
diff --git a/res/values-mcc222-ne/strings.xml b/res/values-mcc222-ne/strings.xml
index da03c7b..874ea8a 100644
--- a/res/values-mcc222-ne/strings.xml
+++ b/res/values-mcc222-ne/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT अलर्ट"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"सार्वजनिक चेतावनी"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-nl/strings.xml b/res/values-mcc222-nl/strings.xml
index 5758712..1b6fea3 100644
--- a/res/values-mcc222-nl/strings.xml
+++ b/res/values-mcc222-nl/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Openbare waarschuwingen"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Essentiële berichten kunnen worden ontvangen, ongeacht de gebruikersinstellingen"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testberichten"</string>
 </resources>
diff --git a/res/values-mcc222-or/strings.xml b/res/values-mcc222-or/strings.xml
index 3f21b5e..42db26e 100644
--- a/res/values-mcc222-or/strings.xml
+++ b/res/values-mcc222-or/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-ଆଲର୍ଟ"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"ସାର୍ବଜନୀନ ଚେତାବନୀ"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-pa/strings.xml b/res/values-mcc222-pa/strings.xml
index bd902ff..084f0a6 100644
--- a/res/values-mcc222-pa/strings.xml
+++ b/res/values-mcc222-pa/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="cmas_presidential_level_alert" msgid="2884179444895260284">"ਆਈ.ਟੀ.-ਸੁਚੇਤਨਾ"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"ਜਨਤਕ ਚਿਤਾਵਨੀਆਂ"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-pl/strings.xml b/res/values-mcc222-pl/strings.xml
index 968bf89..c5fab41 100644
--- a/res/values-mcc222-pl/strings.xml
+++ b/res/values-mcc222-pl/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Alert dla Włoch"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Ostrzeżenia publiczne"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Krytyczne wiadomości mogą przychodzić niezależnie od ustawień użytkownika"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Wiadomości testowe"</string>
 </resources>
diff --git a/res/values-mcc222-pt-rPT/strings.xml b/res/values-mcc222-pt-rPT/strings.xml
index cc7113d..fbe4785 100644
--- a/res/values-mcc222-pt-rPT/strings.xml
+++ b/res/values-mcc222-pt-rPT/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Alerta IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Avisos públicos"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Podem ser recebidas mensagens críticas, independentemente das definições do utilizador."</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mensagens de teste"</string>
 </resources>
diff --git a/res/values-mcc222-pt/strings.xml b/res/values-mcc222-pt/strings.xml
index 16a6e7f..e1ec6bd 100644
--- a/res/values-mcc222-pt/strings.xml
+++ b/res/values-mcc222-pt/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Alerta de TI"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Alertas públicos"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Mensagens críticas podem ser recebidas independentemente das configurações do usuário"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mensagens de teste"</string>
 </resources>
diff --git a/res/values-mcc222-ro/strings.xml b/res/values-mcc222-ro/strings.xml
index 8c61323..bc3df76 100644
--- a/res/values-mcc222-ro/strings.xml
+++ b/res/values-mcc222-ro/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Alertă IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Avertismente publice"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Mesajele esențiale se pot livra indiferent de setările utilizatorilor"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mesaje test"</string>
 </resources>
diff --git a/res/values-mcc222-ru/strings.xml b/res/values-mcc222-ru/strings.xml
index 5758712..2c7efb1 100644
--- a/res/values-mcc222-ru/strings.xml
+++ b/res/values-mcc222-ru/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Общедоступные предупреждения"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-si/strings.xml b/res/values-mcc222-si/strings.xml
index 8b8a7b2..7fcaa6f 100644
--- a/res/values-mcc222-si/strings.xml
+++ b/res/values-mcc222-si/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-ඇඟවීම"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"පොදු අනතුරු ඇඟවීම්"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-sk/strings.xml b/res/values-mcc222-sk/strings.xml
index bc5ce1b..83b0832 100644
--- a/res/values-mcc222-sk/strings.xml
+++ b/res/values-mcc222-sk/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Varovanie IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Verejné upozornenia"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Kritické správy sa môžu zobraziť bez ohľadu na nastavenia používateľa"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testovacie správy"</string>
 </resources>
diff --git a/res/values-mcc222-sl/strings.xml b/res/values-mcc222-sl/strings.xml
index 9408286..e29c68c 100644
--- a/res/values-mcc222-sl/strings.xml
+++ b/res/values-mcc222-sl/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Opozorilo za IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Javna opozorila"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Uporabnik lahko prejme sporočila s kritičnimi opozorili ne glede na svoje nastavitve"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Preizkusna sporočila"</string>
 </resources>
diff --git a/res/values-mcc222-sq/strings.xml b/res/values-mcc222-sq/strings.xml
index 5758712..67cb110 100644
--- a/res/values-mcc222-sq/strings.xml
+++ b/res/values-mcc222-sq/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Paralajmërime publike"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Mesazhet kritike mund të shfaqen pavarësisht nga cilësimet e përdoruesit"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mesazhet e testit"</string>
 </resources>
diff --git a/res/values-mcc222-sr/strings.xml b/res/values-mcc222-sr/strings.xml
index 57fce5a..cca98bb 100644
--- a/res/values-mcc222-sr/strings.xml
+++ b/res/values-mcc222-sr/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Упозорење италијанске владе"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Јавна упозорења"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-sv/strings.xml b/res/values-mcc222-sv/strings.xml
index f175f70..3585738 100644
--- a/res/values-mcc222-sv/strings.xml
+++ b/res/values-mcc222-sv/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-varning"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Varningar till allmänheten"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Viktiga meddelanden kan visas oberoende av användarinställningar"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Testmeddelanden"</string>
 </resources>
diff --git a/res/values-mcc222-sw/strings.xml b/res/values-mcc222-sw/strings.xml
index 78ec384..3310926 100644
--- a/res/values-mcc222-sw/strings.xml
+++ b/res/values-mcc222-sw/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Ilani ya IT"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Ilani za umma"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Huenda ukapokea ujumbe muhimu licha ya mipangilio ya mtumiaji"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Ujumbe wa majaribio"</string>
 </resources>
diff --git a/res/values-mcc222-ta/strings.xml b/res/values-mcc222-ta/strings.xml
index 8cb99f9..20e8f0f 100644
--- a/res/values-mcc222-ta/strings.xml
+++ b/res/values-mcc222-ta/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT எச்சரிக்கை"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"பொது எச்சரிக்கைகள்"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-te/strings.xml b/res/values-mcc222-te/strings.xml
index 5db00ea..93d8e08 100644
--- a/res/values-mcc222-te/strings.xml
+++ b/res/values-mcc222-te/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-అలర్ట్"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"పబ్లిక్ హెచ్చరికలు"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-th/strings.xml b/res/values-mcc222-th/strings.xml
index 99f7131..aa21222 100644
--- a/res/values-mcc222-th/strings.xml
+++ b/res/values-mcc222-th/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="cmas_presidential_level_alert" msgid="2884179444895260284">"การแจ้งเตือนทางไอที"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"คำเตือนสาธารณะ"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-tl/strings.xml b/res/values-mcc222-tl/strings.xml
index 208953f..e6c6388 100644
--- a/res/values-mcc222-tl/strings.xml
+++ b/res/values-mcc222-tl/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="cmas_presidential_level_alert" msgid="2884179444895260284">"Presidential na Antas na Alerto"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Mga pampublikong babala"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Posibleng pumasok pa rin ang mga napakahalagang mensahe anuman ang mga setting ng user"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Mga panubok na mensahe"</string>
 </resources>
diff --git a/res/values-mcc222-tr/strings.xml b/res/values-mcc222-tr/strings.xml
index db6fca3..8c497db 100644
--- a/res/values-mcc222-tr/strings.xml
+++ b/res/values-mcc222-tr/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Uyarısı"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Herkese açık uyarılar"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Önemli mesajlar kullanıcı ayarlarından bağımsız olarak alınabilir"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Test mesajları"</string>
 </resources>
diff --git a/res/values-mcc222-uk/strings.xml b/res/values-mcc222-uk/strings.xml
index 5758712..074ea14 100644
--- a/res/values-mcc222-uk/strings.xml
+++ b/res/values-mcc222-uk/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Попередження для всіх"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-ur/strings.xml b/res/values-mcc222-ur/strings.xml
index 27792e4..71021fa 100644
--- a/res/values-mcc222-ur/strings.xml
+++ b/res/values-mcc222-ur/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="cmas_presidential_level_alert" msgid="2884179444895260284">"آئی ٹی الرٹ"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"عوامی وارننگز"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-uz/strings.xml b/res/values-mcc222-uz/strings.xml
index 5758712..72c9631 100644
--- a/res/values-mcc222-uz/strings.xml
+++ b/res/values-mcc222-uz/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Ommaviy ogohlantirishlar"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Muhim xabarlar foydalanuvchi sozlamalaridan qatʼi nazar keladi"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"SMSlar"</string>
 </resources>
diff --git a/res/values-mcc222-vi/strings.xml b/res/values-mcc222-vi/strings.xml
index 5758712..c0a7b7c 100644
--- a/res/values-mcc222-vi/strings.xml
+++ b/res/values-mcc222-vi/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Cảnh báo công khai"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Thông báo quan trọng có thể vẫn xuất hiện, bất kể tùy chọn cài đặt của người dùng"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Thông báo thử nghiệm"</string>
 </resources>
diff --git a/res/values-mcc222-zh-rCN/strings.xml b/res/values-mcc222-zh-rCN/strings.xml
index 3028d2d..38b10bb 100644
--- a/res/values-mcc222-zh-rCN/strings.xml
+++ b/res/values-mcc222-zh-rCN/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT 警报"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"公共警告"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-zh-rHK/strings.xml b/res/values-mcc222-zh-rHK/strings.xml
index b856874..eea95c9 100644
--- a/res/values-mcc222-zh-rHK/strings.xml
+++ b/res/values-mcc222-zh-rHK/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT 警示"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"公共警報"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-zh-rTW/strings.xml b/res/values-mcc222-zh-rTW/strings.xml
index 85a6ebd..d4d4ab9 100644
--- a/res/values-mcc222-zh-rTW/strings.xml
+++ b/res/values-mcc222-zh-rTW/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT 警報"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"公共警報"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <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-zu/strings.xml b/res/values-mcc222-zu/strings.xml
index 5758712..ed30c4c 100644
--- a/res/values-mcc222-zu/strings.xml
+++ b/res/values-mcc222-zu/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="cmas_presidential_level_alert" msgid="2884179444895260284">"IT-Alert"</string>
+    <string name="sms_cb_settings" msgid="8489556780139246683">"Izexwayiso zasesidlangalaleni"</string>
     <!-- no translation found for cmas_extreme_alert (8930893242227527613) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_observed_alert (3037852378370476280) -->
     <skip />
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5388568769567706023) -->
     <skip />
-    <!-- no translation found for cmas_severe_alert (5143747644314951321) -->
+    <!-- no translation found for enable_cmas_extreme_threat_alerts_title (4190349287603327927) -->
     <skip />
-    <!-- no translation found for cmas_amber_alert (8474556156456621408) -->
-    <skip />
+    <string name="alerts_header_summary" msgid="5963536832729208581">"Imilayezo ebucayi ingangena ngokunganaki amasethingi omsebenzisi"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="7658007515811137035">"Imilayezo yokuhlola"</string>
 </resources>
diff --git a/res/values-mcc222/config.xml b/res/values-mcc222/config.xml
index 531d781..bf4879d 100644
--- a/res/values-mcc222/config.xml
+++ b/res/values-mcc222/config.xml
@@ -15,9 +15,9 @@
 -->
 <resources>
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">true</bool>
-    <!-- Whether to append date-time to the alert title -->
-    <bool name="show_date_time_title">true</bool>
+    <bool name="override_dnd">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-mcc222/strings.xml b/res/values-mcc222/strings.xml
index 2ccb98c..d90280e 100644
--- a/res/values-mcc222/strings.xml
+++ b/res/values-mcc222/strings.xml
@@ -15,6 +15,8 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
            xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- required Italian (it) for this message: "Allarmi pubblici" -->
+    <string name="sms_cb_settings">Public warnings</string>
      <!-- CMAS dialog title for presidential level alert.  [CHAR LIMIT=50] -->
     <string name="cmas_presidential_level_alert" translatable="false">IT-Alert</string>
     <!-- CMAS dialog title for extreme alert. [CHAR LIMIT=50] -->
diff --git a/res/values-mcc226/config.xml b/res/values-mcc226/config.xml
index 7e4ce22..48539c0 100644
--- a/res/values-mcc226/config.xml
+++ b/res/values-mcc226/config.xml
@@ -19,7 +19,7 @@
     <bool name="show_presidential_alerts_settings">true</bool>
     <!-- 4370 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true</item>
+        <item>0x1112:rat=gsm, emergency=true, always_on=true</item>
     </string-array>
     <!-- 4371 -->
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
diff --git a/res/values-mcc230-mnc01/config.xml b/res/values-mcc230-mnc01/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc230-mnc01/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc231-mnc02/config.xml b/res/values-mcc231-mnc02/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc231-mnc02/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc232-mnc03/config.xml b/res/values-mcc232-mnc03/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc232-mnc03/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc232-mnc07/config.xml b/res/values-mcc232-mnc07/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc232-mnc07/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc234-af/strings.xml b/res/values-mcc234-af/strings.xml
new file mode 100644
index 0000000..107a4df
--- /dev/null
+++ b/res/values-mcc234-af/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Uiterste waarskuwings"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Ernstige waarskuwings"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Toetswaarskuwings"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Oefeningopletberigte"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Regeringwaarskuwing"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Uiterste waarskuwing"</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">"Ernstige waarskuwing"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Toetswaarskuwing"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Oefeningopletberig"</string>
+    <string name="app_label" msgid="3863159788297913185">"Noodwaarskuwings"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Noodwaarskuwings"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Ontvang noodwaarskuwingkennisgewings"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Gebruik teks-na-spraak om noodwaarskuwingboodskappe hardop te sê"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Jy ontvang tans noodwaarskuwings. Wil jy aanhou om noodwaarskuwings te ontvang?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Noodwaarskuwings"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tik om noodwaarskuwinginstellings te sien"</string>
+</resources>
diff --git a/res/values-mcc234-am/strings.xml b/res/values-mcc234-am/strings.xml
new file mode 100644
index 0000000..50643e7
--- /dev/null
+++ b/res/values-mcc234-am/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"የመንግስት ማንቂያ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"እጅግ ከፍተኛ ማንቂያ"</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">"ከባድ ማንቂያ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"ማንቂያን ሞክር"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"የልምምድ ማንቂያ"</string>
+    <string name="app_label" msgid="3863159788297913185">"አስቸኳይ ማንቂያዎች"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"አስቸኳይ ማንቂያዎች"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"የድንገተኛ አደጋ ማንቂያ ማሳወቂያዎችን ይቀበሉ"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"የአደጋ ጊዜ ማስጠንቀቂያ መልዕክቶችን ለመናገር የፅሁፍ-ወደ- ንግግርን ተጠቀም"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"በአሁኑ ጊዜ የአስቸኳይ ጊዜ ማንቂያዎችን እየተቀበሉ ነዎት። የአስቸኳይ ጊዜ ማንቂያዎችን መቀበል መቀጠል ይፈልጋሉ?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"አስቸኳይ ማንቂያዎች"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"የድንገተኛ አደጋ ማንቂያ ቅንብሮችን ለማየት መታ ያድርጉ"</string>
+</resources>
diff --git a/res/values-mcc234-ar/strings.xml b/res/values-mcc234-ar/strings.xml
new file mode 100644
index 0000000..3b2abf2
--- /dev/null
+++ b/res/values-mcc234-ar/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"تنبيه حكومي"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"تنبيه حالة طوارئ قصوى"</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">"تنبيه حالة طوارئ شديدة"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"تنبيه تجريبي"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"تنبيه تدريبي"</string>
+    <string name="app_label" msgid="3863159788297913185">"تنبيهات الطوارئ"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"تنبيهات الطوارئ"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"تلقّي تنبيهات الطوارئ"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"استخدام ميزة تحويل النص إلى كلام لقول رسائل تنبيه الطوارئ"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"تتلقّى حاليًا تنبيهات طوارئ. هل تريد مواصلة تلقّي تنبيهات الطوارئ؟"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"تنبيهات الطوارئ"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"انقر للاطّلاع على إعدادات تنبيهات الطوارئ."</string>
+</resources>
diff --git a/res/values-mcc234-as/strings.xml b/res/values-mcc234-as/strings.xml
new file mode 100644
index 0000000..38d9b26
--- /dev/null
+++ b/res/values-mcc234-as/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"চৰকাৰী সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"চৰম সতৰ্কবাৰ্তা"</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">"গুৰুতৰ সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"পৰীক্ষামূলক সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"অনুশীলন সতৰ্কবাৰ্তা"</string>
+    <string name="app_label" msgid="3863159788297913185">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"জৰুৰীকালীন সতৰ্কবাৰ্তাৰ জাননী পাওক"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"জৰুৰীকালীন সতৰ্কবাৰ্তাৰ বাৰ্তাসমূহ ক’বলৈ পাঠৰ পৰা কথনৰ সুবিধা ব্যৱহাৰ কৰক"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"আপুনি বৰ্তমান জৰুৰীকালীন সতৰ্কবাৰ্তা লাভ কৰি আছে। আপুনি জৰুৰীকালীন সতৰ্কবাৰ্তা পোৱাটো অব্যাহত ৰাখিব বিচাৰেনে?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"জৰুৰীকালীন সতৰ্কবাৰ্তাৰ ছেটিং চাবলৈ টিপক"</string>
+</resources>
diff --git a/res/values-mcc234-az/strings.xml b/res/values-mcc234-az/strings.xml
new file mode 100644
index 0000000..0eb2276b
--- /dev/null
+++ b/res/values-mcc234-az/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"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">"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>
+    <!-- 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">"Ciddi Hal Siqnalı"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Test Siqnalı"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Məşq Siqnalı"</string>
+    <string name="app_label" msgid="3863159788297913185">"Fövqəladə hal siqnalları"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Fövqəladə hal siqnalları"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Fövqəladə hal siqnalı bildirişlərini alın"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Fövqəladə hal siqnalı mesajlarını söyləmək üçün nitq sintezindən istifadə edin"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Hazırda fövqəladə hal siqnalları alırsınız. Fövqəladə hal siqnallarını almağa davam etmək istəyirsiniz?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Fövqəladə hal siqnalları"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Fövqəladə hal siqnalı ayarlarını görmək üçün toxunun"</string>
+</resources>
diff --git a/res/values-mcc234-b+sr+Latn/strings.xml b/res/values-mcc234-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..bfe14f8
--- /dev/null
+++ b/res/values-mcc234-b+sr+Latn/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Obaveštenja o ekstremnoj opasnosti"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Obaveštenja o ozbiljnoj opasnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Probna obaveštenja"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Obaveštenja o vežbanju"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Obaveštenje koje izdaje državni organ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Obaveštenje o ekstremnoj opasnosti"</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">"Obaveštenje o ozbiljnoj opasnosti"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Probno obaveštenje"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Obaveštenje o vežbanju"</string>
+    <string name="app_label" msgid="3863159788297913185">"Obaveštenja o hitnim slučajevima"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Obaveštenja o hitnim slučajevima"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Primajte obaveštenja o hitnim slučajevima"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Koristi pretvaranje teksta u govor za izgovaranje poruka obaveštenja o hitnim slučajevima"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Trenutno primate obaveštenja o hitnim slučajevima. Želite li da nastavite da ih primate?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Obaveštenja o hitnim slučajevima"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Dodirnite da biste videli podešavanja obaveštenja o hitnim slučajevima"</string>
+</resources>
diff --git a/res/values-mcc234-be/strings.xml b/res/values-mcc234-be/strings.xml
new file mode 100644
index 0000000..aadc94a
--- /dev/null
+++ b/res/values-mcc234-be/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Абвестка ад дзяржаўнай установы"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Экстранная абвестка"</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">"Абвестка пра сур\'ёзную пагрозу"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Тэставая абвестка"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Трэніровачная абвестка"</string>
+    <string name="app_label" msgid="3863159788297913185">"Абвесткі аб надзвычайных сітуацыях"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Абвесткі аб надзвычайных сітуацыях"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Атрымліваць абвесткі аб надзвычайных сітуацыях"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Выкарыстоўваць сінтэз маўлення, каб прагаворваць аварыйныя апавяшчэнні"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Цяпер вы атрымліваеце абвесткі аб надзвычайных сітуацыях. Хочаце і далей іх атрымліваць?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Абвесткі аб надзвычайных сітуацыях"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Націсніце, каб убачыць налады абвестак аб надзвычайных сітуацыях"</string>
+</resources>
diff --git a/res/values-mcc234-bg/strings.xml b/res/values-mcc234-bg/strings.xml
new file mode 100644
index 0000000..20cd1b6
--- /dev/null
+++ b/res/values-mcc234-bg/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Правителствен сигнал"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Сигнал за извънредна заплаха"</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">"Сигнал за сериозна заплаха"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Тестови сигнал"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Сигнал за провеждане на учение"</string>
+    <string name="app_label" msgid="3863159788297913185">"Сигнали при спешни случаи"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Сигнали при спешни случаи"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Получаване на известия за сигнали при спешни случаи"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Използване на синтезиран говор за съобщенията за сигнали при спешни случаи"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Понастоящем получавате сигнали при спешни случаи. Искате ли да продължите да ги получавате?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Сигнали при спешни случаи"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Докоснете, за да видите настройките за сигналите при спешни случаи"</string>
+</resources>
diff --git a/res/values-mcc234-bn/strings.xml b/res/values-mcc234-bn/strings.xml
new file mode 100644
index 0000000..9ec3fa0
--- /dev/null
+++ b/res/values-mcc234-bn/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"সরকারি সতর্কতা"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"চরম সতর্কতা"</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">"গুরুতর সতর্কতা"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"পরীক্ষামূলক সতর্কতা"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"মহড়ার জন্য সতর্কতা"</string>
+    <string name="app_label" msgid="3863159788297913185">"জরুরি সতর্কতা"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"জরুরি সতর্কতা"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"জরুরি সতর্কতা সম্পর্কিত বিজ্ঞপ্তি পান"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"জরুরি সতর্কতা দিতে টেক্সট-টু-স্পিচ ব্যবহার করুন"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"আপনি বর্তমানে জরুরি সতর্কতা পাচ্ছেন। আপনি কি জরুরি সতর্কতা পাওয়া চালিয়ে যেতে চান?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"জরুরি সতর্কতা"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"জরুরি সতর্কতা সেটিংস দেখতে ট্যাপ করুন"</string>
+</resources>
diff --git a/res/values-mcc234-bs/strings.xml b/res/values-mcc234-bs/strings.xml
new file mode 100644
index 0000000..7bc42f2
--- /dev/null
+++ b/res/values-mcc234-bs/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Izuzetno hitna upozorenja"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Upozorenja na opasne situacije"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Probna upozorenja"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Upozorenja za vježbu"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Upozorenje državne agencije"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Izuzetno hitno upozorenje"</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">"Upozorenje na opasnu situaciju"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Probno upozorenje"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Upozorenje za vježbu"</string>
+    <string name="app_label" msgid="3863159788297913185">"Hitna upozorenja"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Hitna upozorenja"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Primajte obavještenja o hitnim upozorenjima"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Koristite pretvaranje teksta u govor za izgovaranje hitnih upozorenja"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Trenutno primate hitna upozorenja. Želite li ih primati i dalje?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Hitna upozorenja"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Dodirnite da vidite postavke hitnih upozorenja"</string>
+</resources>
diff --git a/res/values-mcc234-ca/strings.xml b/res/values-mcc234-ca/strings.xml
new file mode 100644
index 0000000..4a369f7
--- /dev/null
+++ b/res/values-mcc234-ca/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alertes extremes"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alertes importants"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alertes de prova"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alertes de simulacre"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerta governamental"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alerta extrema"</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">"Alerta important"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alerta de prova"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Simulacre d\'alerta"</string>
+    <string name="app_label" msgid="3863159788297913185">"Alertes d\'emergència"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Alertes d\'emergència"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Rep notificacions d\'alertes d\'emergència"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Utilitza text a parla per enunciar els missatges d\'alertes d\'emergència"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Actualment reps alertes d\'emergència. Vols continuar rebent-ne?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertes d\'emergència"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Toca per veure la configuració de les alertes d\'emergència"</string>
+</resources>
diff --git a/res/values-mcc234-cs/strings.xml b/res/values-mcc234-cs/strings.xml
new file mode 100644
index 0000000..bce99fc
--- /dev/null
+++ b/res/values-mcc234-cs/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Extrémní výstrahy"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Závažné výstrahy"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testovací výstrahy"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Cvičné výstrahy"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Vládní výstraha"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Extrémní výstraha"</string>
+    <!-- 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">"Závažná výstraha"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testovací výstraha"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Cvičná výstraha"</string>
+    <string name="app_label" msgid="3863159788297913185">"Výstražné zprávy"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Výstražné zprávy"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Dostávat oznámení o výstražných zprávách"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Přečíst výstražné zprávy pomocí převodu textu na řeč"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Aktuálně jste přihlášeni k odběru výstražných zpráv. Chcete je odebírat i nadále?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Výstražné zprávy"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Klepnutím zobrazíte nastavení výstražných zpráv"</string>
+</resources>
diff --git a/res/values-mcc234-da/strings.xml b/res/values-mcc234-da/strings.xml
new file mode 100644
index 0000000..6ba0d10
--- /dev/null
+++ b/res/values-mcc234-da/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alarmer ved ekstrem fare"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alarmer ved alvorlig fare"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testalarmer"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Øvelsesalarmer"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"National alarm"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alarm ved ekstrem fare"</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">"Alarm ved alvorlig fare"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testalarm"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Øvelsesalarm"</string>
+    <string name="app_label" msgid="3863159788297913185">"Nødalarmer"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Nødalarmer"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Få notifikationer om nødalarmer"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Brug oplæsning for at få læst beskeder om nødalarmer"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Du modtager i øjeblikket nødadvarsler. Vil du fortsætte med at modtage dem?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Nødalarmer"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tryk for at se indstillinger for nødalarmer"</string>
+</resources>
diff --git a/res/values-mcc234-de/strings.xml b/res/values-mcc234-de/strings.xml
new file mode 100644
index 0000000..a9a7f46
--- /dev/null
+++ b/res/values-mcc234-de/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Warnungen der Kategorie „Extrem“"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Warnungen der Kategorie „Ernst“"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Warnungen der Kategorie „Test“"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Warnungen der Kategorie „Übung“"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Warnung von örtlichen Behörden"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Warnung der Kategorie „Extrem“"</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">"Warnung der Kategorie „Ernst“"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Warnung der Kategorie „Test“"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Warnung der Kategorie „Übung“"</string>
+    <string name="app_label" msgid="3863159788297913185">"Notfallbenachrichtigungen"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Notfallbenachrichtigungen"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Notfallbenachrichtigungen erhalten"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Notfallbenachrichtigungen per Sprachausgabe vorlesen"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Du erhältst derzeit Notfallbenachrichtigungen. Möchtest du das weiterhin?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Notfallbenachrichtigungen"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tippe hier, um die Einstellungen für Notfallbenachrichtigungen anzeigen zu lassen"</string>
+</resources>
diff --git a/res/values-mcc234-el/strings.xml b/res/values-mcc234-el/strings.xml
new file mode 100644
index 0000000..0546624
--- /dev/null
+++ b/res/values-mcc234-el/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Κρατική ειδοποίηση"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Ειδοποίηση ακραίας κατάστασης"</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">"Ειδοποίηση σοβαρής κατάστασης"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Δοκιμαστική ειδοποίηση"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Ειδοποίηση άσκησης"</string>
+    <string name="app_label" msgid="3863159788297913185">"Ειδοποιήσεις έκτακτης ανάγκης"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Ειδοποιήσεις έκτακτης ανάγκης"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Λήψη ειδοποιήσεων έκτακτης ανάγκης"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Χρήση της μετατροπής κειμένου σε ομιλία για την εκφώνηση μηνυμάτων ειδοποίησης έκτακτης ανάγκης"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Αυτήν τη στιγμή λαμβάνετε ειδοποιήσεις έκτακτης ανάγκης. Θέλετε να συνεχίσετε να λαμβάνετε ειδοποιήσεις έκτακτης ανάγκης;"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Ειδοποιήσεις έκτακτης ανάγκης"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Πατήστε για να δείτε τις ρυθμίσεις ειδοποιήσεων έκτακτης ανάγκης"</string>
+</resources>
diff --git a/res/values-mcc234-en-rAU/strings.xml b/res/values-mcc234-en-rAU/strings.xml
new file mode 100644
index 0000000..246c5cd
--- /dev/null
+++ b/res/values-mcc234-en-rAU/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Extreme alerts"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Severe alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Test alerts"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Exercise alerts"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Government alert"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Extreme alert"</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">"Severe alert"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Test alert"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Exercise alert"</string>
+    <string name="app_label" msgid="3863159788297913185">"Emergency alerts"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Emergency alerts"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Receive emergency alert notifications"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Use text-to-speech to speak emergency alert messages"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"You are currently receiving emergency alerts. Would you like to continue receiving emergency alerts?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Emergency alerts"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tap to see emergency alert settings"</string>
+</resources>
diff --git a/res/values-mcc234-en-rCA/strings.xml b/res/values-mcc234-en-rCA/strings.xml
new file mode 100644
index 0000000..246c5cd
--- /dev/null
+++ b/res/values-mcc234-en-rCA/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Extreme alerts"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Severe alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Test alerts"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Exercise alerts"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Government alert"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Extreme alert"</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">"Severe alert"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Test alert"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Exercise alert"</string>
+    <string name="app_label" msgid="3863159788297913185">"Emergency alerts"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Emergency alerts"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Receive emergency alert notifications"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Use text-to-speech to speak emergency alert messages"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"You are currently receiving emergency alerts. Would you like to continue receiving emergency alerts?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Emergency alerts"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tap to see emergency alert settings"</string>
+</resources>
diff --git a/res/values-mcc234-en-rGB/strings.xml b/res/values-mcc234-en-rGB/strings.xml
new file mode 100644
index 0000000..246c5cd
--- /dev/null
+++ b/res/values-mcc234-en-rGB/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Extreme alerts"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Severe alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Test alerts"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Exercise alerts"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Government alert"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Extreme alert"</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">"Severe alert"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Test alert"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Exercise alert"</string>
+    <string name="app_label" msgid="3863159788297913185">"Emergency alerts"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Emergency alerts"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Receive emergency alert notifications"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Use text-to-speech to speak emergency alert messages"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"You are currently receiving emergency alerts. Would you like to continue receiving emergency alerts?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Emergency alerts"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tap to see emergency alert settings"</string>
+</resources>
diff --git a/res/values-mcc234-en-rIN/strings.xml b/res/values-mcc234-en-rIN/strings.xml
new file mode 100644
index 0000000..246c5cd
--- /dev/null
+++ b/res/values-mcc234-en-rIN/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Extreme alerts"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Severe alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Test alerts"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Exercise alerts"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Government alert"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Extreme alert"</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">"Severe alert"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Test alert"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Exercise alert"</string>
+    <string name="app_label" msgid="3863159788297913185">"Emergency alerts"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Emergency alerts"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Receive emergency alert notifications"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Use text-to-speech to speak emergency alert messages"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"You are currently receiving emergency alerts. Would you like to continue receiving emergency alerts?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Emergency alerts"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tap to see emergency alert settings"</string>
+</resources>
diff --git a/res/values-mcc234-en-rXC/strings.xml b/res/values-mcc234-en-rXC/strings.xml
new file mode 100644
index 0000000..65ce33d
--- /dev/null
+++ b/res/values-mcc234-en-rXC/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎Extreme alerts‎‏‎‎‏‎"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎Severe alerts‎‏‎‎‏‎"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‎‎‎Test alerts‎‏‎‎‏‎"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎Exercise alerts‎‏‎‎‏‎"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎Government Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎Extreme Alert‎‏‎‎‏‎"</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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‎Severe Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎Test Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎Exercise Alert‎‏‎‎‏‎"</string>
+    <string name="app_label" msgid="3863159788297913185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‎Emergency alerts‎‏‎‎‏‎"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‎‎Emergency alerts‎‏‎‎‏‎"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎Receive emergency alert notifications‎‏‎‎‏‎"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎Use text-to-speech to speak emergency alert messages‎‏‎‎‏‎"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎You are currently receiving emergency alerts. Would you like to continue receiving emergency alerts?‎‏‎‎‏‎"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‏‏‎Emergency alerts‎‏‎‎‏‎"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‎Tap to see emergency alert settings‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-mcc234-es-rUS/strings.xml b/res/values-mcc234-es-rUS/strings.xml
new file mode 100644
index 0000000..177cb62
--- /dev/null
+++ b/res/values-mcc234-es-rUS/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alertas extremas"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alertas graves"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alertas de prueba"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alertas de simulacro"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerta de organismo público"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alerta extrema"</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">"Alerta grave"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alerta de prueba"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Alerta de simulacro"</string>
+    <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 de alerta de emergencia"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Usar texto a voz para mensajes de alerta de emergencia"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"En este momento, estás recibiendo alertas de emergencia. ¿Te gustaría 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">"Presiona para ver la configuración de alerta de emergencia"</string>
+</resources>
diff --git a/res/values-mcc234-es/strings.xml b/res/values-mcc234-es/strings.xml
new file mode 100644
index 0000000..178169e
--- /dev/null
+++ b/res/values-mcc234-es/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alertas extremas"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alertas graves"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alertas de prueba"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alertas de simulacro"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerta de organismo público"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alerta extrema"</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">"Alerta grave"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alerta de prueba"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Simulacro de alerta"</string>
+    <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 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>
+</resources>
diff --git a/res/values-mcc234-et/strings.xml b/res/values-mcc234-et/strings.xml
new file mode 100644
index 0000000..896188b
--- /dev/null
+++ b/res/values-mcc234-et/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Äärmusliku olukorra hoiatused"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Tõsise olukorra hoiatused"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testhoiatused"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Treeningu märguanded"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Riiklik hoiatus"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Äärmusliku olukorra hoiatus"</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">"Tõsise olukorra hoiatus"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testhoiatus"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Treeningu märguanne"</string>
+    <string name="app_label" msgid="3863159788297913185">"Hädaolukorra hoiatused"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Hädaolukorra hoiatused"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Saadetakse hädaolukorra hoiatuste märguandeid"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Kõnesünteesi funktsiooni kasutamine hädaolukorra hoiatuste sõnumite esitamiseks kõnena"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Praegu on hädaolukorra hoiatuste saamine kasutusel. Kas soovite hädaolukorra hoiatusi jätkuvalt saada?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Hädaolukorra hoiatused"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Puudutage hädaolukorra hoiatuste seadete nägemiseks"</string>
+</resources>
diff --git a/res/values-mcc234-eu/strings.xml b/res/values-mcc234-eu/strings.xml
new file mode 100644
index 0000000..55b4231
--- /dev/null
+++ b/res/values-mcc234-eu/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"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_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>
+    <!-- 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">"Alerta larria"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testu-mezu bidezko 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>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Jaso larrialdi-alerten jakinarazpenak"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Erabili testua ahots bihurtzeko eginbidea larrialdi-alerten mezuak ozen irakurtzeko"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Larrialdi-alertak jasotzen ari zara. Larrialdi-alertak jasotzen jarraitu nahi duzu?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Larrialdi-alertak"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Sakatu larrialdi-alerten ezarpenak ikusteko"</string>
+</resources>
diff --git a/res/values-mcc234-fa/strings.xml b/res/values-mcc234-fa/strings.xml
new file mode 100644
index 0000000..3b4d1cd
--- /dev/null
+++ b/res/values-mcc234-fa/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"هشدار دولتی"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"هشدار شدید"</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">"هشدار جدی"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"هشدار آزمایشی"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"هشدار تمرینی"</string>
+    <string name="app_label" msgid="3863159788297913185">"هشدارهای اضطراری"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"هشدارهای اضطراری"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"دریافت اعلان‌های هشدار اضطراری"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"برای گفتن پیام‌های هشدار اضطراری، از «نوشتار به گفتار» استفاده کنید"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"شما درحال‌حاضر هشدارهای اضطراری را دریافت می‌کنید. آیا می‌خواهید همچنان هشدارهای اضطراری دریافت کنید؟"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"هشدارهای اضطراری"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"برای دیدن تنظیمات هشدار اضطراری ضربه بزنید"</string>
+</resources>
diff --git a/res/values-mcc234-fi/strings.xml b/res/values-mcc234-fi/strings.xml
new file mode 100644
index 0000000..c78d988
--- /dev/null
+++ b/res/values-mcc234-fi/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Erittäin vakavat hälytykset"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Vakavat hälytykset"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testihälytykset"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Harjoitushälytykset"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Viranomaisten hälytys"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Erittäin vakava hälytys"</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">"Vakava hälytys"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testihälytys"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Harjoitushälytys"</string>
+    <string name="app_label" msgid="3863159788297913185">"Hätähälytykset"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Hätähälytykset"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Vastaanota ilmoituksia hätähälytyksistä"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Käytä tekstistä puheeksi -toimintoa hätähälytysviesteissä"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Sinulle lähetetään tällä hetkellä hätähälytyksiä. Haluatko jatkaa niiden vastaanottamista?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Hätähälytykset"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Katso hätähälytysten asetukset napauttamalla"</string>
+</resources>
diff --git a/res/values-mcc234-fr-rCA/strings.xml b/res/values-mcc234-fr-rCA/strings.xml
new file mode 100644
index 0000000..bcff7dd
--- /dev/null
+++ b/res/values-mcc234-fr-rCA/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alertes extrêmes"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alertes sévères"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alertes tests"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alertes d\'exercice"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerte gouvernementale"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alerte extrême"</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">"Alerte sévère"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alerte test"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Alerte d\'exercice"</string>
+    <string name="app_label" msgid="3863159788297913185">"Alertes d\'urgence"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Alertes d\'urgence"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Recevoir les notifications d\'alerte d\'urgence"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Utiliser la synthèse vocale pour lire à voix haute les messages d\'alerte d\'urgence"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Vous recevez actuellement les alertes d\'urgence. Voulez-vous continuer à les recevoir?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertes d\'urgence"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Toucher pour voir les paramètres d\'alerte d\'urgence"</string>
+</resources>
diff --git a/res/values-mcc234-fr/strings.xml b/res/values-mcc234-fr/strings.xml
new file mode 100644
index 0000000..b9dcbca
--- /dev/null
+++ b/res/values-mcc234-fr/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alertes critiques"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alertes graves"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alertes de test"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alertes d\'exercice"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerte du gouvernement"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alerte critique"</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">"Alerte grave"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alerte de test"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Alerte d\'exercice"</string>
+    <string name="app_label" msgid="3863159788297913185">"Alertes d\'urgence"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Alertes d\'urgence"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Recevoir les notifications d\'alerte d\'urgence"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Utiliser la synthèse vocale pour énoncer des messages d\'alerte d\'urgence"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Vous recevez actuellement les alertes d\'urgence. Voulez-vous continuer de les recevoir ?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertes d\'urgence"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Appuyez ici pour voir les paramètres des alertes d\'urgence"</string>
+</resources>
diff --git a/res/values-mcc234-gl/strings.xml b/res/values-mcc234-gl/strings.xml
new file mode 100644
index 0000000..37e9e45
--- /dev/null
+++ b/res/values-mcc234-gl/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alertas extremas"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alertas graves"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alertas de proba"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alertas de simulacro"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerta gobernamental"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alerta extrema"</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">"Alerta grave"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alerta de proba"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Alerta de simulacro"</string>
+    <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="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>
+</resources>
diff --git a/res/values-mcc234-gu/strings.xml b/res/values-mcc234-gu/strings.xml
new file mode 100644
index 0000000..3df031d
--- /dev/null
+++ b/res/values-mcc234-gu/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"સરકારી અલર્ટ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"અત્યંત ગંભીર અલર્ટ"</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">"ગંભીર અલર્ટ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"પરીક્ષણ માટેનું અલર્ટ"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"કસરત માટેનું અલર્ટ"</string>
+    <string name="app_label" msgid="3863159788297913185">"ઇમર્જન્સી અલર્ટ"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"ઇમર્જન્સી અલર્ટ"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ઇમર્જન્સી અલર્ટના નોટિફિકેશન પ્રાપ્ત કરો"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ઇમર્જન્સી અલર્ટ સંદેશા બોલવા માટે ટેક્સ્ટ ટૂ સ્પીચનો ઉપયોગ કરો"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"તમે હાલમાં ઇમર્જન્સી અલર્ટ પ્રાપ્ત કરી રહ્યાં છો. શું તમે ઇમર્જન્સી અલર્ટ પ્રાપ્ત કરવાનું ચાલુ રાખવા માગો છો?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ઇમર્જન્સી અલર્ટ"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ઇમર્જન્સી અલર્ટના સેટિંગ જોવા માટે ટૅપ કરો"</string>
+</resources>
diff --git a/res/values-mcc234-hi/strings.xml b/res/values-mcc234-hi/strings.xml
new file mode 100644
index 0000000..7f6b703
--- /dev/null
+++ b/res/values-mcc234-hi/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"सरकार की ओर से जारी की गई चेतावनी"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"बेहद गंभीर स्थिति की चेतावनी"</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">"गंभीर स्थिति की चेतावनी"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"हर महीने होने वाली जांच की चेतावनी"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"सुरक्षा ड्रिल से जुड़ी चेतावनी"</string>
+    <string name="app_label" msgid="3863159788297913185">"आपातकालीन स्थितियों के लिए चेतावनियां"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"आपातकालीन स्थितियों के लिए चेतावनियां"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"आपातकालीन स्थिति की चेतावनी की सूचनाएं पाएं"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"आपातकालीन स्थिति की चेतावनी के मैसेज सुनने के लिए, \'लिखाई को बोली में बदलना\' सुविधा का इस्तेमाल करें"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"फ़िलहाल, आपको आपातकालीन स्थितियों की चेतावनियां मिल रही हैं. क्या आप आगे भी आपातकालीन स्थितियों की चेतावनियां पाना चाहते हैं?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"आपातकालीन स्थितियों के लिए चेतावनियां"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"आपातकालीन स्थिति की चेतावनी की सेटिंग देखने के लिए टैप करें"</string>
+</resources>
diff --git a/res/values-mcc234-hr/strings.xml b/res/values-mcc234-hr/strings.xml
new file mode 100644
index 0000000..f9ed8fd
--- /dev/null
+++ b/res/values-mcc234-hr/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Upozorenja o ekstremnoj situaciji"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Upozorenja o ozbiljnoj situaciji"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testna upozorenja"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Probna upozorenja"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Upozorenje državnih tijela"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Upozorenje o ekstremnoj situaciji"</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">"Upozorenje o ozbiljnoj situaciji"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testno upozorenje"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Probno upozorenje"</string>
+    <string name="app_label" msgid="3863159788297913185">"Hitna upozorenja"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Hitna upozorenja"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Primajte obavijesti o hitnim upozorenjima"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Upotrijebite pretvaranje teksta u govor za izgovaranje hitnih upozorenja"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Trenutačno primate hitna upozorenja. Želite li ih primati i dalje?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Hitna upozorenja"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Dodirnite da biste vidjeli postavke hitnih upozorenja"</string>
+</resources>
diff --git a/res/values-mcc234-hu/strings.xml b/res/values-mcc234-hu/strings.xml
new file mode 100644
index 0000000..689bbd0
--- /dev/null
+++ b/res/values-mcc234-hu/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Rendkívüli riasztások"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Súlyos riasztások"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Próbariasztások"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Gyakorlati riasztások"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Kormányzati riasztás"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Rendkívüli riasztás"</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">"Súlyos riasztás"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Próbariasztás"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Gyakorlati riasztás"</string>
+    <string name="app_label" msgid="3863159788297913185">"Vészriasztások"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Vészriasztások"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Vészhelyzeti figyelmeztető értesítések fogadása"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Használja a szövegfelolvasót vészhelyzeti figyelmeztető üzenetek felolvasására"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Ön jelenleg fogad vészriasztásokat. Szeretné a továbbiakban is fogadni ezeket?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Vészriasztások"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Koppintson ide a vészriasztások beállításainak megtekintéséhez"</string>
+</resources>
diff --git a/res/values-mcc234-hy/strings.xml b/res/values-mcc234-hy/strings.xml
new file mode 100644
index 0000000..c8ebbfb
--- /dev/null
+++ b/res/values-mcc234-hy/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Պաշտոնական ծանուցում"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Ծանուցում ծայրահեղ վտանգավոր իրավիճակի մասին"</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">"Ծանուցում վտանգավոր իրավիճակի մասին"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Փորձնական ծանուցում"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Ուսումնական տագնապ"</string>
+    <string name="app_label" msgid="3863159788297913185">"Ծանուցումներ արտակարգ իրավիճակների մասին"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Ծանուցումներ արտակարգ իրավիճակների մասին"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Ստանալ արտակարգ իրավիճակների մասին ծանուցումներ"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Օգտագործել տեքստի հնչեցումը՝ արտակարգ իրավիճակների մասին ծանուցումներն ընթերցելու համար"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Դուք ստանում եք արտակարգ իրավիճակների մասին ծանուցումներ։ Ցանկանո՞ւմ եք ստանա՞լ դրանք հետագայում ևս։"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Ծանուցումներ արտակարգ իրավիճակների մասին"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Հպեք՝ արտակարգ իրավիճակների մասին ծանուցումների կարգավորումները տեսնելու համար"</string>
+</resources>
diff --git a/res/values-mcc234-in/strings.xml b/res/values-mcc234-in/strings.xml
new file mode 100644
index 0000000..0d9fbe1
--- /dev/null
+++ b/res/values-mcc234-in/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Peringatan ekstrem"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Peringatan serius"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Peringatan pengujian"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Peringatan latihan"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Peringatan Pemerintah"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Peringatan Ekstrem"</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">"Peringatan Serius"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Peringatan Pengujian"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Peringatan Latihan"</string>
+    <string name="app_label" msgid="3863159788297913185">"Peringatan darurat"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Peringatan darurat"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Terima notifikasi peringatan darurat"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Gunakan text-to-speech untuk mengucapkan pesan peringatan darurat"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Saat ini Anda menerima peringatan darurat. Apakah Anda ingin terus menerima peringatan darurat?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Peringatan darurat"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Ketuk untuk melihat setelan peringatan darurat"</string>
+</resources>
diff --git a/res/values-mcc234-is/strings.xml b/res/values-mcc234-is/strings.xml
new file mode 100644
index 0000000..84e721a
--- /dev/null
+++ b/res/values-mcc234-is/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Mjög alvarlegar viðvaranir"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alvarlegar viðvaranir"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Prufuviðvaranir"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Æfingaviðvaranir"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Viðvörun frá yfirvöldum"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Mjög alvarleg viðvörun"</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">"Alvarleg viðvörun"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Prufuviðvörun"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Æfingaviðvörun"</string>
+    <string name="app_label" msgid="3863159788297913185">"Neyðartilkynningar"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Neyðartilkynningar"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Fá tilkynningar um neyðarviðvaranir"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Nota talgervil til að lesa skilaboð neyðarviðvarana upphátt"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Þér berast neyðarviðvaranir. Viltu halda áfram að fá neyðarviðvaranir?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Neyðartilkynningar"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Ýttu til að skoða stillingar neyðarviðvarana"</string>
+</resources>
diff --git a/res/values-mcc234-it/strings.xml b/res/values-mcc234-it/strings.xml
new file mode 100644
index 0000000..e7301a3
--- /dev/null
+++ b/res/values-mcc234-it/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Allerte per condizioni estreme"</string>
+    <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_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="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 allerte 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="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>
+</resources>
diff --git a/res/values-mcc234-iw/strings.xml b/res/values-mcc234-iw/strings.xml
new file mode 100644
index 0000000..f4dab88
--- /dev/null
+++ b/res/values-mcc234-iw/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"התראה ממשלתית"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"התראה קיצונית"</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">"התראה חמורה"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"התראת בדיקה"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"התראת תרגול"</string>
+    <string name="app_label" msgid="3863159788297913185">"התראות חירום"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"התראות חירום"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"קבלת התראות על מקרי חירום"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"‏שימוש בהמרת טקסט לדיבור (TTS) להקראה של התראות על מקרי חירום"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"ההגדרה שלך עכשיו היא לקבל התראות על מקרי חירום. האם ברצונך להמשיך לקבל התראות על מקרי חירום?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"התראות חירום"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"יש להקיש כדי לראות את ההגדרות של ההתראות על מקרי חירום"</string>
+</resources>
diff --git a/res/values-mcc234-ja/strings.xml b/res/values-mcc234-ja/strings.xml
new file mode 100644
index 0000000..fe5839c
--- /dev/null
+++ b/res/values-mcc234-ja/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"政府機関発の速報メール"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"最重要速報メール"</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">"重要速報メール"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"テスト速報メール"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"訓練用速報メール"</string>
+    <string name="app_label" msgid="3863159788297913185">"緊急速報メール"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"緊急速報メール"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"緊急速報メールの通知を受信する"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"緊急速報メール受信時にメッセージを読み上げる"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"現在、緊急速報メールを受信するように設定されています。今後も緊急速報メールを受信しますか?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"緊急速報メール"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"タップして緊急速報メールの設定を表示"</string>
+</resources>
diff --git a/res/values-mcc234-ka/strings.xml b/res/values-mcc234-ka/strings.xml
new file mode 100644
index 0000000..73a8328
--- /dev/null
+++ b/res/values-mcc234-ka/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"სამთავრობო გაფრთხილება"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"ექსტრემალური ვითარების გაფრთხილება"</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">"გაფრთხილება მძიმე პირობების შესახებ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"სატესტო გაფრთხილება"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"სავარჯიშო გაფრთხილება"</string>
+    <string name="app_label" msgid="3863159788297913185">"საგანგებო ვითარებების გაფრთხილებები"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"საგანგებო ვითარებების გაფრთხილებები"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"საგანგებო ვითარებების გაფრთხილების შეტყობინებების მიღება"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"საგანგებო ვითარებების გაფრთხილებების შეტყობინებების ტექსტის გახმოვანება"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"ამჟამად იღებთ საგანგებო ვითარებების გაფრთხილებებს. გსურთ გააგრძელოთ საგანგებო ვითარებების გაფრთხილებების მიღება?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"საგანგებო ვითარებების გაფრთხილებები"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"შეეხეთ საგანგებო ვითარებების გაფრთხილებების პარამეტრების სანახავად"</string>
+</resources>
diff --git a/res/values-mcc234-kk/strings.xml b/res/values-mcc234-kk/strings.xml
new file mode 100644
index 0000000..b28abb9
--- /dev/null
+++ b/res/values-mcc234-kk/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Үкімет хабарландыруы"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Өте маңызды хабарландыру"</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">"Маңыздылығы жоғары хабарландыру"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Сынақ хабарландыру"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Жаттығу хабарландыруы"</string>
+    <string name="app_label" msgid="3863159788297913185">"Төтенше жағдай хабарландырулары"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Төтенше жағдай хабарландырулары"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Төтенше жағдай хабарландыруларын алу"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Төтенше жағдай хабарландыруларын дыбыстау үшін мәтінді дыбыстау функциясын пайдаланыңыз."</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Сіз қазір төтенше жағдай хабарландыруларын алып жатырсыз. Төтенше жағдай хабарландыруларын әрі қарай ала бергіңіз келе ме?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Төтенше жағдай хабарландырулары"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Төтенше жағдай хабарландыру параметрлерін көру үшін түртіңіз"</string>
+</resources>
diff --git a/res/values-mcc234-km/strings.xml b/res/values-mcc234-km/strings.xml
new file mode 100644
index 0000000..ed41e62
--- /dev/null
+++ b/res/values-mcc234-km/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"ការជូនដំណឹង​ពីរដ្ឋាភិបាល"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"ការជូនដំណឹង​ពេលមានអាសន្នធ្ងន់ធ្ងរខ្លាំង"</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">"ការជូនដំណឹង​ពេលមានអាសន្នធ្ងន់ធ្ងរ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"ការ​ជូន​ដំណឹងអំពីការសាកល្បង"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"ការជូនដំណឹង​អំពី​ការហ្វឹកហាត់"</string>
+    <string name="app_label" msgid="3863159788297913185">"ការជូន​ដំណឹង​ពេលអាសន្ន"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"ការជូន​ដំណឹង​ពេលអាសន្ន"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ទទួលការជូនដំណឹង​ពេលមានអាសន្ន"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ប្រើ​មុខងារបំប្លែងអត្ថបទ​ទៅជាការ​និយាយ​ ដើម្បីអាន​សារ​ជូនដំណឹង​ពេលមាន​អាសន្ន"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"បច្ចុប្បន្ន​អ្នក​កំពុង​ទទួល​បានការ​ជូន​ដំណឹង​ពេល​អាសន្ន។ តើ​អ្នក​ចង់​បន្ត​ទទួល​បានការ​ជូន​ដំណឹង​ពេល​អាសន្ន​ដែរ​ទេ?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ការជូន​ដំណឹង​ពេលអាសន្ន"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ចុចដើម្បីមើលការកំណត់ការជូនដំណឹង​ពេលមានអាសន្ន"</string>
+</resources>
diff --git a/res/values-mcc234-kn/strings.xml b/res/values-mcc234-kn/strings.xml
new file mode 100644
index 0000000..c651fdc
--- /dev/null
+++ b/res/values-mcc234-kn/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"ಸರ್ಕಾರದ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"ತೀವ್ರ ಎಚ್ಚರಿಕೆ"</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">"ಗಂಭೀರ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"ಪರೀಕ್ಷೆ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"ವ್ಯಾಯಾಮ ಕುರಿತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="app_label" msgid="3863159788297913185">"ತುರ್ತು ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"ತುರ್ತು ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ತುರ್ತು ಎಚ್ಚರಿಕೆ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಿ"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ತುರ್ತು ಎಚ್ಚರಿಕೆ ಸಂದೇಶಗಳನ್ನು ಹೇಳಲು ಪಠ್ಯದಿಂದ ಧ್ವನಿಯನ್ನು ಬಳಸಿ"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"ನೀವು ಪ್ರಸ್ತುತ ತುರ್ತು ಎಚ್ಚರಿಕೆಗಳನ್ನು ಸ್ವೀಕರಿಸುತ್ತಿರುವಿರಿ. ತುರ್ತು ಎಚ್ಚರಿಕೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದನ್ನು ಮುಂದುವರಿಸಲು ನೀವು ಬಯಸುವಿರಾ?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ತುರ್ತು ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ತುರ್ತು ಎಚ್ಚರಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೋಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+</resources>
diff --git a/res/values-mcc234-ko/strings.xml b/res/values-mcc234-ko/strings.xml
new file mode 100644
index 0000000..ff7d8b8
--- /dev/null
+++ b/res/values-mcc234-ko/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"정부 기관 알림 문자"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"안전 안내 문자"</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">"위험 알림 문자"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"테스트 알림 문자"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"훈련 알림 문자"</string>
+    <string name="app_label" msgid="3863159788297913185">"긴급 재난 문자"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"긴급 재난 문자"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"긴급 재난 문자 받기"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"텍스트 음성 변환을 사용하여 긴급 재난 문자를 음성으로 듣기"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"현재 긴급 재난 문자를 수신하고 있습니다. 긴급 재난 문자를 계속 수신하시겠습니까?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"긴급 재난 문자"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"탭하여 긴급 재난 문자 설정 보기"</string>
+</resources>
diff --git a/res/values-mcc234-ky/strings.xml b/res/values-mcc234-ky/strings.xml
new file mode 100644
index 0000000..4ca74b3
--- /dev/null
+++ b/res/values-mcc234-ky/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Жалпыга шашылыш билдирүү"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Өтө коркунучтуу кырдаал жөнүндө шашылыш билдирүү"</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">"Олуттуу кырдаал жөнүндө шашылыш билдирүү"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Сынамык шашылыш билдирүү"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Көнүгүү билдирүүсү"</string>
+    <string name="app_label" msgid="3863159788297913185">"Шашылыш билдирүүлөр"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Шашылыш билдирүүлөр"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Шашылыш билдирүүлөрдү алуу"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Шашылыш билдирүүнү угуу үчүн кеп синтезаторун колдонуңуз"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Учурда шашылыш билдирүүлөрдү алып жатасыз. Мындан ары да ала бересизби?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Шашылыш билдирүүлөр"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Шашылыш билдирүү жөндөөлөрүн көрүү үчүн басыңыз"</string>
+</resources>
diff --git a/res/values-mcc234-lo/strings.xml b/res/values-mcc234-lo/strings.xml
new file mode 100644
index 0000000..a81f20b
--- /dev/null
+++ b/res/values-mcc234-lo/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"ການແຈ້ງເຕືອນລັດຖະບານ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"ການແຈ້ງເຕືອນຂັ້ນສູງສຸດ"</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">"ການແຈ້ງເຕືອນຮ້າຍແຮງ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"ການແຈ້ງເຕືອນທົດສອບ"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"ການແຈ້ງເຕືອນເຝິກແອບ"</string>
+    <string name="app_label" msgid="3863159788297913185">"ການແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"ການແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ຮັບການແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ໃຊ້ການປ່ຽນຂໍ້ຄວາມເປັນສຽງເວົ້າເພື່ອອ່ານຂໍ້ຄວາມການແຈ້ງເຕືອນສຸກເສີນອອກສຽງ"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"ຕອນນີ້ທ່ານກຳລັງຮັບການແຈ້ງເຕືອນສຸກເສີນຢູ່. ທ່ານຕ້ອງການສືບຕໍ່ຮັບການແຈ້ງເຕືອນສຸກເສີນຕໍ່ໄປບໍ່?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ການແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ແຕະເພື່ອເບິ່ງການຕັ້ງຄ່າການແຈ້ງເຕືອນສຸກເສີນ"</string>
+</resources>
diff --git a/res/values-mcc234-lt/strings.xml b/res/values-mcc234-lt/strings.xml
new file mode 100644
index 0000000..9e058fc
--- /dev/null
+++ b/res/values-mcc234-lt/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Skubūs įspėjimai"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Rimtos grėsmės įspėjimai"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Bandomieji įspėjimai"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Įspėjimai apie pratybas"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Vyriausybinės įspėjimas"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Skubus įspėjimas"</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">"Rimtos grėsmės įspėjimas"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Bandomasis įspėjimas"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Įspėjimas apie pratybas"</string>
+    <string name="app_label" msgid="3863159788297913185">"Kritinės padėties įspėjimai"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Kritinės padėties įspėjimai"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Gauti kritinės padėties įspėjimų pranešimus"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Naudoti teksto į kalbą priemonę, kad būtų galima pasakyti kritinės padėties įspėjimų pranešimus"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Šiuo metu gaunate kritinės padėties įspėjimus. Ar norite toliau gauti kritinės padėties įspėjimus?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Kritinės padėties įspėjimai"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Palieskite, kad peržiūrėtumėte kritinės padėties įspėjimų nustatymus"</string>
+</resources>
diff --git a/res/values-mcc234-lv/strings.xml b/res/values-mcc234-lv/strings.xml
new file mode 100644
index 0000000..3c4c0ed
--- /dev/null
+++ b/res/values-mcc234-lv/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Brīdinājumi par ārkārtas situāciju"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Brīdinājumi par nopietnu situāciju"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testa brīdinājumi"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Mācību trauksmes"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Valsts līmeņa brīdinājums"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Brīdinājums par ārkārtas situāciju"</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">"Brīdinājums par nopietnu situāciju"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testa brīdinājums"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Mācību trauksme"</string>
+    <string name="app_label" msgid="3863159788297913185">"Ārkārtas brīdinājumi"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Ārkārtas brīdinājumi"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Saņemt ārkārtas brīdinājumu paziņojumus"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Izmantot teksta pārvēršanu runā, lai izrunātu ārkārtas brīdinājumu ziņojumus"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Pašlaik jūs saņemat ārkārtas brīdinājumus. Vai vēlaties arī turpmāk saņemt ārkārtas brīdinājumus?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Ārkārtas brīdinājumi"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Pieskarieties, lai skatītu ārkārtas brīdinājumu iestatījumus"</string>
+</resources>
diff --git a/res/values-mcc234-mk/strings.xml b/res/values-mcc234-mk/strings.xml
new file mode 100644
index 0000000..590af04
--- /dev/null
+++ b/res/values-mcc234-mk/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Владино предупредување"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Предупредување за екстремна закана"</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">"Предупредување за сериозна закана"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Пробно предупредување"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Предупредување за вежба"</string>
+    <string name="app_label" msgid="3863159788297913185">"Предупредувања за итни случаи"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Предупредувања за итни случаи"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Примај известувања за предупредувања за итни случаи"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Користи „Од текст во говор“ за изговарање пораки за предупредувања за итни случаи"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Во моментот добивате предупредувања за итни случаи. Дали сакате да продолжите да ги добивате?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Предупредувања за итни случаи"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Допрете за да ги видите поставките за предупредувања за итни случаи"</string>
+</resources>
diff --git a/res/values-mcc234-ml/strings.xml b/res/values-mcc234-ml/strings.xml
new file mode 100644
index 0000000..b470a7a
--- /dev/null
+++ b/res/values-mcc234-ml/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"സർക്കാർ മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"അതീവ ഗുരുതര മുന്നറിയിപ്പ്"</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">"ഗുരുതര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"പരീക്ഷണ മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"പരിശീലന മുന്നറിയിപ്പ്"</string>
+    <string name="app_label" msgid="3863159788297913185">"അടിയന്തര മുന്നറിയിപ്പുകൾ"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"അടിയന്തര മുന്നറിയിപ്പുകൾ"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"അടിയന്തര മുന്നറിയിപ്പ് അറിയിപ്പുകൾ നേടുക"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"അടിയന്തര മുന്നറിയിപ്പ് സന്ദേശങ്ങൾ പറയാൻ ടെക്‌സ്റ്റ്‌ ടു സ്‌പീച്ച് ഉപയോഗിക്കുക"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"നിങ്ങൾക്ക് നിലവിൽ അടിയന്തര മുന്നറിയിപ്പുകൾ ലഭിക്കുന്നു. തുടർന്നും നിങ്ങൾക്ക് അടിയന്തര മുന്നറിയിപ്പുകൾ ലഭിക്കേണ്ടതുണ്ടോ?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"അടിയന്തര മുന്നറിയിപ്പുകൾ"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"അടിയന്തര മുന്നറിയിപ്പ് ക്രമീകരണം കാണാൻ ടാപ്പ് ചെയ്യുക"</string>
+</resources>
diff --git a/res/values-mcc234-mn/strings.xml b/res/values-mcc234-mn/strings.xml
new file mode 100644
index 0000000..a7e6ffb
--- /dev/null
+++ b/res/values-mcc234-mn/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Засгийн газрын сэрэмжлүүлэг"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Гамшгийн сэрэмжлүүлэг"</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">"Ноцтой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Туршилтын сэрэмжлүүлэг"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Сургуулилалтын сэрэмжлүүлэг"</string>
+    <string name="app_label" msgid="3863159788297913185">"Яаралтай сэрэмжлүүлэг"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Яаралтай сэрэмжлүүлэг"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Яаралтай сэрэмжлүүлгийн мэдэгдэл авах"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Яаралтай сэрэмжлүүлгийн мессежүүдийг уншихын тулд бичвэрийг ярианд хувиргахыг ашиглана уу"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Та одоо яаралтай сэрэмжлүүлэг хүлээн авч байна. Үргэлжлүүлэн хүлээн авах уу?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Яаралтай сэрэмжлүүлэг"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Яаралтай сэрэмжлүүлгийн тохиргоог харах бол товших"</string>
+</resources>
diff --git a/res/values-mcc234-mr/strings.xml b/res/values-mcc234-mr/strings.xml
new file mode 100644
index 0000000..d43cad2
--- /dev/null
+++ b/res/values-mcc234-mr/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"सरकारी सूचना"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"अतिविषमतेसंबंधित सूचना"</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">"गंभीर स्थितीशी संबंधित सूचना"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"चाचणीची सूचना"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"व्यायामाशी संबंधित सूचना"</string>
+    <string name="app_label" msgid="3863159788297913185">"आणीबाणीच्या सूचना"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"आणीबाणीच्या सूचना"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"आणीबाणीमधील इशाऱ्याची सूचना मिळवा"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"आणीबाणीमधील सूचनेचा मेसेज बोलण्यासाठी टेक्स्ट-टू-स्पीच वापरा"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"तुम्हाला सध्या आणीबाणीच्या सूचना मिळत आहेत. तुम्ही आणीबाणीच्या सूचना मिळवणे सुरू ठेऊ इच्छिता का?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"आणीबाणीच्या सूचना"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"आणीबाणीच्या सूचनेशी संबंधित सेटिंग्ज पाहण्यासाठी टॅप करा"</string>
+</resources>
diff --git a/res/values-mcc234-ms/strings.xml b/res/values-mcc234-ms/strings.xml
new file mode 100644
index 0000000..5f9e316
--- /dev/null
+++ b/res/values-mcc234-ms/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Makluman ekstrem"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Makluman serius"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Makluman ujian"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Makluman latihan"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Makluman Kerajaan"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Makluman Ekstrem"</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">"Makluman Serius"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Makluman Ujian"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Makluman Latihan"</string>
+    <string name="app_label" msgid="3863159788297913185">"Makluman kecemasan"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Makluman kecemasan"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Terima pemberitahuan makluman kecemasan"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Gunakan teks kepada pertuturan untuk menuturkan mesej makluman kecemasan"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Anda sedang menerima makluman kecemasan. Adakah anda ingin terus menerima makluman kecemasan?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Makluman kecemasan"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Ketik untuk melihat tetapan makluman kecemasan"</string>
+</resources>
diff --git a/res/values-mcc234-my/strings.xml b/res/values-mcc234-my/strings.xml
new file mode 100644
index 0000000..bf37688
--- /dev/null
+++ b/res/values-mcc234-my/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"အစိုးရ သတိပေးချက်"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"လွန်ကဲမှု သတိပေးချက်"</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">"ပြင်းထန်မှု သတိပေးချက်"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"စစ်ဆေးမှု သတိပေးချက်"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"လေ့ကျင့်ခန်း သတိပေးချက်"</string>
+    <string name="app_label" msgid="3863159788297913185">"အရေးပေါ်သတိပေးချက်များ"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"အရေးပေါ်သတိပေးချက်များ"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"အရေးပေါ်သတိပေးချက် အကြောင်းကြားချက်များကို လက်ခံသည်"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"အရေးပေါ်သတိပေးချက် မက်ဆေ့ဂျ်များ ပြောကြားရန် စာသားမှ စကားပြောသို့ကို အသုံးပြုသည်"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"လောလောဆယ်တွင် အရေးပေါ်သတိပေးချက်များကို ရရှိနေသည်။ အရေးပေါ်သတိပေးချက်များကို ဆက်လက်ရယူလိုပါသလား။"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"အရေးပေါ်သတိပေးချက်များ"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"အရေးပေါ်သတိပေးချက် ဆက်တင်များကို ကြည့်ရန် တို့ပါ"</string>
+</resources>
diff --git a/res/values-mcc234-nb/strings.xml b/res/values-mcc234-nb/strings.xml
new file mode 100644
index 0000000..7800e37
--- /dev/null
+++ b/res/values-mcc234-nb/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Ekstremvarsler"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alvorlige varsler"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testvarsler"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Øvelsesvarsler"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Varsel fra myndigheter"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Ekstremvarsel"</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">"Alvorlig varsel"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testvarsel"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Øvelsesvarsel"</string>
+    <string name="app_label" msgid="3863159788297913185">"Nødvarsler"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Nødvarsler"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Motta nødvarsler"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Bruk tekst til tale for å snakke inn meldinger for nødssituasjoner"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Du mottar for øyeblikket nødvarsler. Vil du fortsette å motta disse varslene?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Nødvarsler"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Trykk for å se innstillingene for nødvarsler"</string>
+</resources>
diff --git a/res/values-mcc234-ne/strings.xml b/res/values-mcc234-ne/strings.xml
new file mode 100644
index 0000000..8518370
--- /dev/null
+++ b/res/values-mcc234-ne/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"सरकारले जारी गरेको अलर्ट"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"अन्त्यन्तै गम्भीर खतरासम्बन्धी अलर्ट"</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">"गम्भीर खतरासम्बन्धी अलर्ट"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"परीक्षणसम्बन्धी अलर्ट"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"व्यायामसम्बन्धी अलर्ट"</string>
+    <string name="app_label" msgid="3863159788297913185">"आपत्‌कालीन अलर्टहरू"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"आपत्‌कालीन अलर्टहरू"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"आपत्‌कालीन अलर्टसम्बन्धी सूचना पठाइयोस्"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"आपत्‌कालीन अलर्टसम्बन्धी म्यासेज पढेर सुनाउन टेक्स्ट-टू-स्पिच सेवा प्रयोग गरियोस्"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"तपाईं हाल आपत्‌कालीन अलर्टहरू प्राप्त गर्दै हुनुहुन्छ। तपाईं भविष्यमा पनि आपत्‌कालीन अलर्टहरू प्राप्त गरिरहन चाहनुहुन्छ?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"आपत्‌कालीन अलर्टहरू"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"आपत्‌कालीन अलर्टसम्बन्धी सेटिङ हेर्न ट्याप गर्नुहोस्"</string>
+</resources>
diff --git a/res/values-mcc234-nl/strings.xml b/res/values-mcc234-nl/strings.xml
new file mode 100644
index 0000000..1da66e4
--- /dev/null
+++ b/res/values-mcc234-nl/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Meldingen voor extreme noodsituaties"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Meldingen voor ernstige noodsituaties"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testmeldingen"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Oefeningsmeldingen"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Melding van de overheid"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Melding voor extreme noodsituatie"</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">"Melding voor ernstige noodsituatie"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testmelding"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Oefeningsmelding"</string>
+    <string name="app_label" msgid="3863159788297913185">"Noodmeldingen"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Noodmeldingen"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Noodmeldingen krijgen"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Tekst-naar-spraak gebruiken om noodmeldingen uit te spreken"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Je krijgt momenteel noodmeldingen. Wil je noodmeldingen blijven ontvangen?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Noodmeldingen"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tik om de instellingen voor noodmeldingen te bekijken"</string>
+</resources>
diff --git a/res/values-mcc234-or/strings.xml b/res/values-mcc234-or/strings.xml
new file mode 100644
index 0000000..d235a22
--- /dev/null
+++ b/res/values-mcc234-or/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"ସରକାରୀ ଆଲର୍ଟ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"ଏକ୍ସଟ୍ରିମ୍ ଆଲର୍ଟ"</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">"ଗୁରୁତର ଆଲର୍ଟ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"ପରୀକ୍ଷା ଆଲର୍ଟ"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"ବ୍ୟାୟାମ ଆଲର୍ଟ"</string>
+    <string name="app_label" msgid="3863159788297913185">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକ"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକ"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ପାଆନ୍ତୁ"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ ମେସେଜ୍ କହିବା ପାଇଁ ଟେକ୍ସଟ୍-ଟୁ-ସ୍ପିଚ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"ଆପଣ ବର୍ତ୍ତମାନ ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକୁ ପ୍ରାପ୍ତ କରୁଛନ୍ତି। ଆପଣ ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକୁ ପ୍ରାପ୍ତ କରିବା ଜାରି ରଖିବାକୁ ଚାହିଁବେ କି?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟଗୁଡ଼ିକ"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ ସେଟିଂସ୍ ଦେଖିବାକୁ ଟାପ୍ କରନ୍ତୁ"</string>
+</resources>
diff --git a/res/values-mcc234-pa/strings.xml b/res/values-mcc234-pa/strings.xml
new file mode 100644
index 0000000..e48ad67
--- /dev/null
+++ b/res/values-mcc234-pa/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"ਸਰਕਾਰੀ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"ਬਹੁਤ ਜ਼ਿਆਦਾ ਖਰਾਬ ਹਾਲਾਤ ਸੰਬੰਧੀ ਸੁਚੇਤਨਾ"</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">"ਗੰਭੀਰ ਹਾਲਾਤ ਸੰਬੰਧੀ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"ਜਾਂਚ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"ਕਸਰਤ ਸੁਚੇਤਨਾ"</string>
+    <string name="app_label" msgid="3863159788297913185">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਵਾਲੇ ਸੁਨੇਹੇ ਬੋਲਣ ਲਈ \'ਲਿਖਤ-ਤੋਂ-ਬੋਲੀ\' ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"ਇਸ ਵੇਲੇ ਤੁਸੀਂ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰਨਾ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਸੈਟਿੰਗਾਂ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
+</resources>
diff --git a/res/values-mcc234-pl/strings.xml b/res/values-mcc234-pl/strings.xml
new file mode 100644
index 0000000..dd356e6
--- /dev/null
+++ b/res/values-mcc234-pl/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alerty o ekstremalnym zagrożeniu"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alerty o poważnym zagrożeniu"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alerty testowe"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alerty ćwiczeniowe"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alert od instytucji"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alert o ekstremalnym zagrożeniu"</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">"Alert o poważnym zagrożeniu"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alert testowy"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Alert ćwiczeniowy"</string>
+    <string name="app_label" msgid="3863159788297913185">"Alerty o zagrożeniu"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Alerty o zagrożeniu"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Otrzymuj alerty o zagrożeniu"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Użyj zamiany tekstu na mowę do odczytywania alertów o zagrożeniu"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Obecnie otrzymujesz alerty o zagrożeniu. Chcesz je nadal dostawać?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alerty o zagrożeniu"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Kliknij, aby zobaczyć ustawienia alertów o zagrożeniu"</string>
+</resources>
diff --git a/res/values-mcc234-pt-rPT/strings.xml b/res/values-mcc234-pt-rPT/strings.xml
new file mode 100644
index 0000000..b17e3fb
--- /dev/null
+++ b/res/values-mcc234-pt-rPT/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alertas extremos"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alertas graves"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alertas de teste"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alertas de exercício"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerta governamental"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alerta extremo"</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">"Alerta grave"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alerta de teste"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Alerta de exercício"</string>
+    <string name="app_label" msgid="3863159788297913185">"Alertas de emergência"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Alertas de emergência"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Receba notificações de alertas de emergência."</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Utilize a síntese de voz para dizer mensagens de alerta de emergência."</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Atualmente, está a receber alertas de emergência. Pretende continuar a receber alertas de emergência?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertas de emergência"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Toque para ver as definições dos alertas de emergência"</string>
+</resources>
diff --git a/res/values-mcc234-pt/strings.xml b/res/values-mcc234-pt/strings.xml
new file mode 100644
index 0000000..773ff15
--- /dev/null
+++ b/res/values-mcc234-pt/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alertas extremos"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alertas graves"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alertas de teste"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Alertas de simulação"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerta governamental"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alerta extremo"</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">"Alerta grave"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alerta de teste"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Alerta de simulação"</string>
+    <string name="app_label" msgid="3863159788297913185">"Alertas de emergência"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Alertas de emergência"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Receber notificações de alerta de emergência"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Usar conversão de texto em voz para falar mensagens de alerta de emergência"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Você está recebendo alertas de emergência. Quer continuar recebendo?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alertas de emergência"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Toque para ver as configurações de alertas de emergência"</string>
+</resources>
diff --git a/res/values-mcc234-ro/strings.xml b/res/values-mcc234-ro/strings.xml
new file mode 100644
index 0000000..b8f1572
--- /dev/null
+++ b/res/values-mcc234-ro/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Alerte extreme"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Alerte grave"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Alerte de testare"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Simulări de alertă"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alertă de la guvern"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Alertă extremă"</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">"Alertă gravă"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Alertă de testare"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Simulare de alertă"</string>
+    <string name="app_label" msgid="3863159788297913185">"Alerte de urgență"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Alerte de urgență"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Primiți notificări privind alertele de urgență"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Folosiți funcția de redare vocală a textului pentru a asculta mesajele alertelor de urgență"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Primirea alertelor de urgență este activată. Doriți să primiți alertele în continuare?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Alerte de urgență"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Atingeți ca să vedeți setările pentru alerte de urgență"</string>
+</resources>
diff --git a/res/values-mcc234-ru/strings.xml b/res/values-mcc234-ru/strings.xml
new file mode 100644
index 0000000..4782c96
--- /dev/null
+++ b/res/values-mcc234-ru/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Правительственное оповещение"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Оповещение о критической угрозе"</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">"Оповещение о серьезной угрозе"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Тестовое оповещение"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Учебная тревога"</string>
+    <string name="app_label" msgid="3863159788297913185">"Экстренные оповещения"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Экстренные оповещения"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Получать экстренные оповещения"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Использовать функцию преобразования текста в речь для чтения экстренных оповещений"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Вы получаете экстренные оповещения. Хотите ли вы получать их в дальнейшем?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Экстренные оповещения"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Нажмите, чтобы посмотреть настройки экстренных оповещений"</string>
+</resources>
diff --git a/res/values-mcc234-si/strings.xml b/res/values-mcc234-si/strings.xml
new file mode 100644
index 0000000..f10f34f
--- /dev/null
+++ b/res/values-mcc234-si/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"රජයේ ඇඟවීම"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"බරපතළ ඇඟවීම"</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">"දරුණු ඇඟවීම"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"පරීක්ෂණ ඇඟවීම"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"ව්‍යායාම ඇඟවීම"</string>
+    <string name="app_label" msgid="3863159788297913185">"හදිසි අවස්ථා ඇඟවීම්"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"හදිසි අවස්ථා ඇඟවීම්"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"හදිසි අවස්ථා ඇඟවීම් දැනුම්දීම් ලබා ගන්න"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"හදිසි අවස්ථා ඇඟවීම් පණිවිඩ කියවීමට පෙළ-සිට-කථනයට භාවිත කරන්න"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"ඔබ දැනට හදිසි අවස්ථා ඇඟවීම් ලබයි. හදිසි අවස්ථා ඇඟවීම් ලැබීම දිගටම පවත්වා ගෙන යාමට ඔබ කැමතිද?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"හදිසි අවස්ථා ඇඟවීම්"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"හදිසි අවස්ථා ඇඟවීම් සැකසීම් බැලීමට තට්ටු කරන්න"</string>
+</resources>
diff --git a/res/values-mcc234-sk/strings.xml b/res/values-mcc234-sk/strings.xml
new file mode 100644
index 0000000..77d1c62
--- /dev/null
+++ b/res/values-mcc234-sk/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Upozornenia na extrémne situácie"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Závažné upozornenia"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testovacie upozornenia"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Cvičné upozornenia"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Upozornenie verejnej správy"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Upozornenie na extrémnu situáciu"</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">"Závažné upozornenie"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testovacie upozornenie"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Cvičné upozornenie"</string>
+    <string name="app_label" msgid="3863159788297913185">"Tiesňové upozornenia"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Tiesňové upozornenia"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Dostávať tiesňové upozornenia"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Čítať tiesňové upozornenia prevodom textu na reč"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Momentálne dostávate tiesňové upozornenia. Chcete ich dostávať aj naďalej?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Tiesňové upozornenia"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Klepnutím zobrazíte nastavenia tiesňových upozornení"</string>
+</resources>
diff --git a/res/values-mcc234-sl/strings.xml b/res/values-mcc234-sl/strings.xml
new file mode 100644
index 0000000..db4cb74
--- /dev/null
+++ b/res/values-mcc234-sl/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Izredno resna opozorila"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Resna opozorila"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Preizkusna opozorila"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Opozorila za vajo"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Vladno opozorilo"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Izredno resno opozorilo"</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">"Resno opozorilo"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Preizkusno opozorilo"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Opozorilo za vajo"</string>
+    <string name="app_label" msgid="3863159788297913185">"Nujna opozorila"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Nujna opozorila"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Prejemanje obvestil o nujnih opozorilih"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Za izgovorjavo nujnih opozoril uporabi pretvorbo besedila v govor."</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Trenutno prejemate nujna opozorila. Ali jih želite prejemati še naprej?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Nujna opozorila"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Dotaknite se za ogled nastavitev nujnih opozoril"</string>
+</resources>
diff --git a/res/values-mcc234-sq/strings.xml b/res/values-mcc234-sq/strings.xml
new file mode 100644
index 0000000..d3a4d60
--- /dev/null
+++ b/res/values-mcc234-sq/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Sinjalizimet ekstreme"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Sinjalizimet e rënda"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Sinjalizimet e testimit"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Sinjalizimet ushtrimore"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Sinjalizim qeveritar"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Sinjalizim ekstrem"</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">"Sinjalizim i rëndë"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Sinjalizim testimi"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Sinjalizim stërvitor"</string>
+    <string name="app_label" msgid="3863159788297913185">"Sinjalizimet e urgjencës"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Sinjalizimet e urgjencës"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Merr njoftimet e sinjalizimeve të urgjencës"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Përdor konvertimin e tekstit në të folur, për të dëgjuar mesazhet e sinjalizimit të urgjencës"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Aktualisht po merr sinjalizime urgjence. Dëshiron që të vazhdosh të marrësh sinjalizime urgjence?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Sinjalizimet e urgjencës"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Trokit për të parë cilësimet e sinjalizimeve të urgjencës"</string>
+</resources>
diff --git a/res/values-mcc234-sr/strings.xml b/res/values-mcc234-sr/strings.xml
new file mode 100644
index 0000000..c274569
--- /dev/null
+++ b/res/values-mcc234-sr/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Обавештење које издаје државни орган"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Обавештење о екстремној опасности"</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">"Обавештење о озбиљној опасности"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Пробно обавештење"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Обавештење о вежбању"</string>
+    <string name="app_label" msgid="3863159788297913185">"Обавештења о хитним случајевима"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Обавештења о хитним случајевима"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Примајте обавештења о хитним случајевима"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Користи претварање текста у говор за изговарање порука обавештења о хитним случајевима"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Тренутно примате обавештења о хитним случајевима. Желите ли да наставите да их примате?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Обавештења о хитним случајевима"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Додирните да бисте видели подешавања обавештења о хитним случајевима"</string>
+</resources>
diff --git a/res/values-mcc234-sv/strings.xml b/res/values-mcc234-sv/strings.xml
new file mode 100644
index 0000000..ac830cc
--- /dev/null
+++ b/res/values-mcc234-sv/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Varningar vid allvarliga nödsituationer"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Varningar om allvarlig fara"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Testvarningar"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Övningsmeddelanden"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Varning från myndigheter"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Varning vid allvarlig nödsituation"</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">"Varning om allvarlig fara"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Testvarning"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Övningsmeddelande"</string>
+    <string name="app_label" msgid="3863159788297913185">"Varningar vid nödsituationer"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Varningar vid nödsituationer"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Få aviseringar om varningar vid nödsituationer"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Använd text till tal när du vill tala in varningsmeddelanden"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Du får för närvarande varningar vid nödsituationer. Vill du fortsätta ta emot varningar vid nödsituationer?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Varningar vid nödsituationer"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Tryck för att visa inställningarna för varningar vid nödsituationer"</string>
+</resources>
diff --git a/res/values-mcc234-sw/strings.xml b/res/values-mcc234-sw/strings.xml
new file mode 100644
index 0000000..d19174a
--- /dev/null
+++ b/res/values-mcc234-sw/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Arifa za hali hatari zaidi"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Arifa za hali hatari"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Arifa za majaribio"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Arifa za mazoezi"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Arifa ya Serikali"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Arifa ya Hali Hatari Zaidi"</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">"Arifa ya Hali Hatari"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Arifa ya Jaribio"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Arifa ya Zoezi"</string>
+    <string name="app_label" msgid="3863159788297913185">"Arifa za dharura"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Arifa za dharura"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Pokea arifa za dharura"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Tumia kipengele cha kusoma maandishi kwa sauti kusoma ujumbe wa arifa za dharura"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Unapokea arifa za dharura kwa sasa. Ungependa kuendelea kupokea arifa hizi?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Arifa za dharura"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Gusa ili uone mipangilio ya arifa za dharura"</string>
+</resources>
diff --git a/res/values-mcc234-ta/strings.xml b/res/values-mcc234-ta/strings.xml
new file mode 100644
index 0000000..123bd1f
--- /dev/null
+++ b/res/values-mcc234-ta/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"அரசு எச்சரிக்கை"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"தீவிர எச்சரிக்கை"</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">"கடுமையான எச்சரிக்கை"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"பரிசோதனை எச்சரிக்கை"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"பயிற்சி எச்சரிக்கை"</string>
+    <string name="app_label" msgid="3863159788297913185">"அவசரகால எச்சரிக்கைகள்"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"அவசரகால எச்சரிக்கைகள்"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"அவசரகால எச்சரிக்கை அறிவிப்புகளைப் பெறுவீர்கள்"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"அவசரகால எச்சரிக்கை மெசேஜ்களைச் சொல்வதற்கு \'உரையிலிருந்து பேச்சு\' அம்சத்தைப் பயன்படுத்துங்கள்"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"தற்போது அவசரகால எச்சரிக்கைகளைப் பெறுகிறீர்கள். இவற்றைத் தொடர்ந்து பெற விரும்புகிறீர்களா?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"அவசரகால எச்சரிக்கைகள்"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"அவசரகால எச்சரிக்கை அமைப்புகளைப் பார்க்க தட்டவும்"</string>
+</resources>
diff --git a/res/values-mcc234-te/strings.xml b/res/values-mcc234-te/strings.xml
new file mode 100644
index 0000000..47a09b2
--- /dev/null
+++ b/res/values-mcc234-te/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"ప్రభుత్వ అలర్ట్"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"అత్యంత తీవ్రమైన అలర్ట్"</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">"తీవ్రమైన అలర్ట్"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"పరీక్ష అలర్ట్"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"వ్యాయామ అలర్ట్"</string>
+    <string name="app_label" msgid="3863159788297913185">"ఎమర్జెన్సీ అలర్ట్‌లు"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"ఎమర్జెన్సీ అలర్ట్‌లు"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ఎమర్జెన్సీ అలర్ట్ నోటిఫికేషన్‌లను అందుకోండి"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ఎమర్జెన్సీ అలర్ట్ మెసేజ్‌లను చదివి వినిపించడానికి \'టెక్స్ట్-టు-స్పీచ్\'ను ఉపయోగించండి"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"మీరు ప్రస్తుతం ఎమర్జెన్సీ అలర్ట్‌లను అందుకుంటున్నారు. ఎమర్జెన్సీ అలర్ట్‌లను అందుకోవడాన్ని కొనసాగించాలనుకుంటున్నారా?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ఎమర్జెన్సీ అలర్ట్‌లు"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ఎమర్జెన్సీ అలర్ట్ సెట్టింగ్‌లను చూడటానికి ట్యాప్ చేయండి"</string>
+</resources>
diff --git a/res/values-mcc234-th/strings.xml b/res/values-mcc234-th/strings.xml
new file mode 100644
index 0000000..4ea3fed
--- /dev/null
+++ b/res/values-mcc234-th/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"การแจ้งเตือนจากรัฐบาล"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"การแจ้งเตือนระดับสูงสุด"</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">"การแจ้งเตือนระดับร้ายแรง"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"การแจ้งเตือนการทดสอบ"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"การแจ้งเตือนการออกกำลังกาย"</string>
+    <string name="app_label" msgid="3863159788297913185">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"รับการแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ใช้การอ่านออกเสียงข้อความเพื่ออ่านข้อความแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"ขณะนี้ คุณได้รับการแจ้งเตือนเหตุฉุกเฉิน คุณต้องการรับการแจ้งเตือนเหตุฉุกเฉินต่อไปไหม"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"แตะเพื่อดูการตั้งค่าการแจ้งเตือนเหตุฉุกเฉิน"</string>
+</resources>
diff --git a/res/values-mcc234-tl/strings.xml b/res/values-mcc234-tl/strings.xml
new file mode 100644
index 0000000..369f1e8
--- /dev/null
+++ b/res/values-mcc234-tl/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Mga extreme na alerto"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Mga malalang alerto"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Mga pansubok na alerto"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Mga alerto para sa pagsasanay"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Alerto mula sa Pamahalaan"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Extreme na Alerto"</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">"Malalang Alerto"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Pansubok na Alerto"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Alerto para sa Pagsasanay"</string>
+    <string name="app_label" msgid="3863159788297913185">"Mga alerto sa emergency"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Mga alerto sa emergency"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Makatanggap ng mga notification sa alerto sa emergency"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Gamitin ang text-to-speech para basahin nang malakas ang mga mensahe ng alerto sa emergency"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Kasalukuyan kang tumatanggap ng mga alerto sa emergency. Gusto mo bang patuloy na makatanggap ng mga alerto sa emergency?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Mga alerto sa emergency"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"I-tap para makita ang mga setting ng alerto sa emergency"</string>
+</resources>
diff --git a/res/values-mcc234-tr/strings.xml b/res/values-mcc234-tr/strings.xml
new file mode 100644
index 0000000..e8239bc
--- /dev/null
+++ b/res/values-mcc234-tr/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Olağanüstü uyarılar"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Ciddi düzeyde uyarılar"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Test amaçlı uyarılar"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Tatbikat uyarıları"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Hükümet Uyarısı"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Olağanüstü Uyarı"</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">"Ciddi Düzeyde Uyarı"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Test Amaçlı Uyarı"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Tatbikat Uyarısı"</string>
+    <string name="app_label" msgid="3863159788297913185">"Acil durum uyarıları"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Acil durum uyarıları"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Acil durum uyarısı bildirimlerini al"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Acil durum uyarı mesajları için metin-konuşma özelliğini kullan"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Şu anda acil durum uyarılarını alabiliyorsunuz. Acil durum uyarılarını almaya devam etmek istiyor musunuz?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Acil durum uyarıları"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Acil durum uyarısı ayarlarını görmek için dokunun"</string>
+</resources>
diff --git a/res/values-mcc234-uk/strings.xml b/res/values-mcc234-uk/strings.xml
new file mode 100644
index 0000000..38420a6
--- /dev/null
+++ b/res/values-mcc234-uk/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Урядове сповіщення"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Сповіщення про надзвичайну ситуацію"</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">"Сповіщення про серйозну ситуацію"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Тестове сповіщення"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Тренувальне сповіщення"</string>
+    <string name="app_label" msgid="3863159788297913185">"Екстрені сповіщення"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Екстрені сповіщення"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Отримувати екстрені сповіщення"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Використовувати синтез мовлення, щоб озвучувати екстрені сповіщення"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Зараз ви отримуєте екстрені сповіщення. Хочете отримувати їх і надалі?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Екстрені сповіщення"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Натисніть, щоб переглянути налаштування екстрених сповіщень"</string>
+</resources>
diff --git a/res/values-mcc234-ur/strings.xml b/res/values-mcc234-ur/strings.xml
new file mode 100644
index 0000000..97c51a1
--- /dev/null
+++ b/res/values-mcc234-ur/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"سرکاری الرٹ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"انتہائی الرٹ"</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">"شدید الرٹ"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"ٹیسٹ الرٹ"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"ورزش الرٹ"</string>
+    <string name="app_label" msgid="3863159788297913185">"ایمرجنسی الرٹس"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"ایمرجنسی الرٹس"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"ہنگامی الرٹ کی اطلاعات موصول کریں"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"ہنگامی الرٹ کے پیغامات بولنے کے لیے ٹیکسٹ ٹو اسپیچ کا استعمال کریں"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"آپ کو فی الحال ہنگامی الرٹس موصول ہو رہے ہیں۔ کیا آپ ہنگامی الرٹس حاصل کرتے رہنا چاہتے ہیں؟"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"ایمرجنسی الرٹس"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"ہنگامی الرٹ کی ترتیبات کو دیکھنے کے لیے تھپتھپائیں"</string>
+</resources>
diff --git a/res/values-mcc234-uz/strings.xml b/res/values-mcc234-uz/strings.xml
new file mode 100644
index 0000000..4f61629
--- /dev/null
+++ b/res/values-mcc234-uz/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Juda muhim ogohlantirishlar"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Jiddiy ogohlantirishlar"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Sinov ogohlantirishlari"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Oʻquv mashqi ogohlantirishlari"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Hukumat ogohlantirishi"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Juda muhim ogohlantirish"</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">"Jiddiy ogohlantirish"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Sinov ogohlantirishi"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Oʻquv mashqi ogohlantirishi"</string>
+    <string name="app_label" msgid="3863159788297913185">"Favqulodda ogohlantirishlar"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Favqulodda ogohlantirishlar"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Favqulodda ogohlantirish bildirishnomalarini olish"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Favqulodda ogohlantirish xabarlarini eshitish uchun matndan-nutqqa vositasidan foydalanish"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Sizda aholini ogohlantirish funksiyasi yoqilgan. Favqulodda ogohlantirishlarni qabul qilishni davom ettirmoqchimisiz?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Favqulodda ogohlantirishlar"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Favqulodda ogohlantiruv sozlamalarini ochish uchun bosing"</string>
+</resources>
diff --git a/res/values-mcc234-vi/strings.xml b/res/values-mcc234-vi/strings.xml
new file mode 100644
index 0000000..735a717
--- /dev/null
+++ b/res/values-mcc234-vi/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Cảnh báo cực kỳ nghiêm trọng"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Cảnh báo nghiêm trọng"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Cảnh báo thử nghiệm"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Cảnh báo mô phỏng"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Cảnh báo của chính phủ"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Cảnh báo cực kỳ nghiêm trọng"</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">"Cảnh báo nghiêm trọng"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Cảnh báo thử nghiệm"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Cảnh báo mô phỏng"</string>
+    <string name="app_label" msgid="3863159788297913185">"Cảnh báo khẩn cấp"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Cảnh báo khẩn cấp"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Nhận thông báo về cảnh báo khẩn cấp"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Sử dụng tính năng chuyển văn bản sang lời nói để đọc to nội dung các cảnh báo khẩn cấp"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Bạn hiện đang nhận cảnh báo khẩn cấp. Bạn có muốn tiếp tục nhận cảnh báo khẩn cấp không?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Cảnh báo khẩn cấp"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Nhấn để xem chế độ cài đặt cảnh báo khẩn cấp"</string>
+</resources>
diff --git a/res/values-mcc234-zh-rCN/strings.xml b/res/values-mcc234-zh-rCN/strings.xml
new file mode 100644
index 0000000..4297a54
--- /dev/null
+++ b/res/values-mcc234-zh-rCN/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"政府警报"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"极严重警报"</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">"严重警报"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"测试警报"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"演习警报"</string>
+    <string name="app_label" msgid="3863159788297913185">"紧急警报"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"紧急警报"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"接收紧急警报通知"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"使用文字转语音功能读出紧急警报消息"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"当前设置是接收紧急警报。是否要继续接收紧急警报?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"紧急警报"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"点按即可查看紧急警报设置"</string>
+</resources>
diff --git a/res/values-mcc234-zh-rHK/strings.xml b/res/values-mcc234-zh-rHK/strings.xml
new file mode 100644
index 0000000..6299997
--- /dev/null
+++ b/res/values-mcc234-zh-rHK/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"政府警示"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"極嚴重警示"</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">"嚴重警示"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"測試警示"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"演習警示"</string>
+    <string name="app_label" msgid="3863159788297913185">"緊急警示"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"緊急警示"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"接收緊急警示通知"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"使用文字轉語音功能說出緊急警示訊息"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"您目前有接收緊急警示,要繼續接收嗎?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"緊急警示"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"輕按即可查看緊急警示設定"</string>
+</resources>
diff --git a/res/values-mcc234-zh-rTW/strings.xml b/res/values-mcc234-zh-rTW/strings.xml
new file mode 100644
index 0000000..8b410a7
--- /dev/null
+++ b/res/values-mcc234-zh-rTW/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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_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>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"政府警報"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"極度緊急警報"</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">"嚴重警報"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"測試警報"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"演習警報"</string>
+    <string name="app_label" msgid="3863159788297913185">"緊急警報"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"緊急警報"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"接收緊急警報通知"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"使用文字轉語音功能說出緊急警報訊息"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"你目前已設定要接收緊急警報。要繼續接收嗎?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"緊急警報"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"輕觸即可查看緊急警報設定"</string>
+</resources>
diff --git a/res/values-mcc234-zu/strings.xml b/res/values-mcc234-zu/strings.xml
new file mode 100644
index 0000000..a52735b
--- /dev/null
+++ b/res/values-mcc234-zu/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources 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">"Izaziso ezedlulele"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="2271741871998936543">"Izaziso ezibucayi"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="6022925848643811044">"Izexwayiso zohlolo"</string>
+    <string name="enable_exercise_test_alerts_title" msgid="411880452689537935">"Izexwayiso zokujima"</string>
+    <string name="cmas_presidential_level_alert" msgid="3429191761649839884">"Izexwayiso Zikahulumeni"</string>
+    <string name="cmas_extreme_alert" msgid="3474352706075109113">"Isexwayiso Esedlulele"</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">"Isexwayiso Esibucayi"</string>
+    <string name="cmas_required_monthly_test" msgid="1226904101913162471">"Isexwayiso Sokuhlola"</string>
+    <string name="cmas_exercise_alert" msgid="4540370572086918020">"Isexwayiso Sokujima"</string>
+    <string name="app_label" msgid="3863159788297913185">"Izaziso ezisheshayo"</string>
+    <string name="sms_cb_settings" msgid="4187131985831792308">"Izaziso ezisheshayo"</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="805446672915814777">"Thola izaziso zesixwayiso esiphuthumayo"</string>
+    <string name="enable_alert_speech_summary" msgid="5021926525240750702">"Sebenzisa ukuguqula-umbhalo-ube-inkulumo ukuze ukhulume imilayezo yesaziso"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="1972978578760513449">"Okwamanje uthola izaziso zesimo esiphuthumayo. Ungathanda ukuqhubeka ukuthola izaziso zesimo esiphuthumayo?"</string>
+    <string name="emergency_alert_settings_title_watches" msgid="5299419351642118203">"Izaziso ezisheshayo"</string>
+    <string name="notification_cb_settings_changed_text" msgid="6861845802821634203">"Thepha ukuze ubone amasethingi esixwayiso sokuphuthuma"</string>
+</resources>
diff --git a/res/values-mcc234/config.xml b/res/values-mcc234/config.xml
new file mode 100644
index 0000000..8f7dc3a
--- /dev/null
+++ b/res/values-mcc234/config.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+  <!-- 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>
+    <!-- additional language -->
+    <item>0x111F:rat=gsm, emergency=true, always_on=true, override_dnd=true</item>
+  </string-array>
+  <!-- 4371~4372, 4384~4385 -->
+  <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
+    <item>0x1113-0x1114:rat=gsm, emergency=true, override_dnd=true</item>
+    <!-- additional language -->
+    <item>0x1120-0x1121:rat=gsm, emergency=true, override_dnd=true</item>
+  </string-array>
+  <!-- 4373~4378, 4386~4391 -->
+  <string-array name="cmas_alerts_severe_range_strings" translatable="false">
+    <item>0x1115-0x111A:rat=gsm, emergency=true, override_dnd=true</item>
+    <!-- additional language -->
+    <item>0x1122-0x1127:rat=gsm, emergency=true, override_dnd=true</item>
+  </string-array>
+  <!-- 4380, 4393 -->
+  <string-array name="required_monthly_test_range_strings" translatable="false">
+    <item>0x111C:rat=gsm, emergency=true</item>
+    <!-- additional language -->
+    <item>0x1129:rat=gsm, emergency=true</item>
+  </string-array>
+  <!-- 4381, 4394 -->
+  <!-- Channels to receive emergency alerts (exercise) -->
+  <string-array name="exercise_alert_range_strings" translatable="false">
+    <item>0x111D:rat=gsm, emergency=true</item>
+    <!-- additional language -->
+    <item>0x112A:rat=gsm, emergency=true</item>
+  </string-array>
+  <!-- Disabled channels -->
+  <string-array name="operator_defined_alert_range_strings" translatable="false">
+  </string-array>
+  <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
+  </string-array>
+  <string-array name="etws_alerts_range_strings" translatable="false">
+  </string-array>
+  <string-array name="etws_test_alerts_range_strings" translatable="false">
+  </string-array>
+  <string-array name="public_safety_messages_channels_range_strings" translatable="false">
+  </string-array>
+
+  <!-- Whether to display exercise test settings even when testing mode is off -->
+  <bool name="show_exercise_settings">false</bool>
+  <!-- whether to display a separate exercise test settings. today, most of time, exercise channels was controlled by the main test toggle. -->
+  <bool name="show_separate_exercise_settings">true</bool>
+  <bool name="show_test_settings">false</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values-mcc234/strings.xml b/res/values-mcc234/strings.xml
new file mode 100644
index 0000000..b9fa464
--- /dev/null
+++ b/res/values-mcc234/strings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Preference title for enable CMAS extreme threat alerts checkbox. [CHAR LIMIT=50] -->
+  <string name="enable_cmas_extreme_threat_alerts_title">Extreme alerts</string>
+  <!-- Preference title for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=50] -->
+  <string name="enable_cmas_severe_threat_alerts_title">Severe alerts</string>
+  <!-- Preference title for other test alerts checkbox. [CHAR LIMIT=50] -->
+  <string name="enable_cmas_test_alerts_title">Test alerts</string>
+  <!-- Preference title for exercise test alerts checkbox. [CHAR LIMIT=50] -->
+  <string name="enable_exercise_test_alerts_title">Exercise alerts</string>
+  <!-- CMAS dialog title for presidential level alert. [CHAR LIMIT=50] -->
+  <string name="cmas_presidential_level_alert">Government Alert</string>
+  <!-- CMAS dialog title for extreme alert. [CHAR LIMIT=50] -->
+  <string name="cmas_extreme_alert">Extreme Alert</string>
+  <!-- CMAS dialog title for extreme alert with extreme severity, immediate urgency, and observed certainty. [CHAR LIMIT=50] -->
+  <string name="cmas_extreme_immediate_observed_alert">@string/cmas_extreme_alert</string>
+  <!-- CMAS dialog title for extreme alert with extreme severity, immediate urgency,  and likely certainty. [CHAR LIMIT=50] -->
+  <string name="cmas_extreme_immediate_likely_alert">@string/cmas_extreme_alert</string>
+  <!-- CMAS dialog title for severe alert. [CHAR LIMIT=50] -->
+  <string name="cmas_severe_alert">Severe Alert</string>
+  <!-- CMAS dialog title for required monthly test. [CHAR LIMIT=50] -->
+  <string name="cmas_required_monthly_test">Test Alert</string>
+  <!-- CMAS dialog title for CMAS Exercise. [CHAR LIMIT=50] -->
+  <string name="cmas_exercise_alert">Exercise Alert</string>
+  <!-- The name of the Cell Broadcast Receiver app. [CHAR LIMIT=NONE] -->
+  <string name="app_label">Emergency alerts</string>
+  <!-- Label for settings screen. [CHAR LIMIT=NONE] -->
+  <string name="sms_cb_settings">Emergency alerts</string>
+  <!-- Preference summaries for allow alerts checkbox. [CHAR LIMIT=66] -->
+  <string name="enable_alerts_master_toggle_summary">Receive emergency alert notifications</string>
+  <!-- Preference summary for enable text-to-speech checkbox. [CHAR LIMIT=101] -->
+  <string name="enable_alert_speech_summary">Use text-to-speech to speak emergency alert messages</string>
+  <!-- CMAS opt-out dialog message. [CHAR LIMIT=160] -->
+  <string name="cmas_opt_out_dialog_text">You are currently receiving emergency alerts. Would you like to continue receiving emergency alerts?</string>
+  <!-- Label to open emergencyNotifications dialog [CHAR LIMIT=40] -->
+  <string name="emergency_alert_settings_title_watches">Emergency alerts</string>
+  <!-- Notification title and text when alerting user that their CB settings have changed -->
+  <string name="notification_cb_settings_changed_text">Tap to see emergency alert settings</string>
+</resources>
diff --git a/res/values-mcc246-iw/strings.xml b/res/values-mcc246-iw/strings.xml
index a832008..acb3384 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_severe_threat_alerts_title" msgid="1140833576401868336">"‏התרעת LT רמה 3"</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-mcc250-mnc02/config.xml b/res/values-mcc250-mnc02/config.xml
new file mode 100644
index 0000000..8441f29
--- /dev/null
+++ b/res/values-mcc250-mnc02/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources>
+  <!-- Area info toggle default value -->
+  <bool name="area_update_info_alerts_enabled_default">false</bool>
+  <string-array name="additional_cbs_channels_strings" translatable="false">
+    <!-- Channel 50 for area update info -->
+    <item>0x32:type=area, emergency=false</item>
+  </string-array>
+  <bool name="config_showAreaUpdateInfoSettings">true</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values-mcc250/config.xml b/res/values-mcc250/config.xml
new file mode 100644
index 0000000..f93a404
--- /dev/null
+++ b/res/values-mcc250/config.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources>
+  <!-- Disable all channels by default -->
+  <bool name="master_toggle_enabled_default">false</bool>
+  <!-- Emergency alerts toggle default value -->
+  <bool name="emergency_alerts_enabled_default">false</bool>
+  <!-- Amber alerts toggle default value -->
+  <bool name="amber_alerts_enabled_default">false</bool>
+  <!-- Extreme alerts toggle default value -->
+  <bool name="extreme_threat_alerts_enabled_default">false</bool>
+  <!-- Severe alerts toggle default value -->
+  <bool name="severe_threat_alerts_enabled_default">false</bool>
+  <!-- Public safety messages toggle default value -->
+  <bool name="public_safety_messages_enabled_default">false</bool>
+  <!-- State local test alerts toggle default value -->
+  <bool name="state_local_test_alerts_enabled_default">false</bool>
+  <!-- Other test alerts toggle default value -->
+  <bool name="test_alerts_enabled_default">false</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values-mcc260-mnc02/config.xml b/res/values-mcc260-mnc02/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc260-mnc02/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc260/config.xml b/res/values-mcc260/config.xml
deleted file mode 100644
index dbb4a32..0000000
--- a/res/values-mcc260/config.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<resources>
-  <!-- Disable emergency alerts -->
-  <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false"></string-array>
-  <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
-  <string-array name="cmas_alerts_severe_range_strings" translatable="false"></string-array>
-  <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"></string-array>
-  <string-array name="required_monthly_test_range_strings" translatable="false"></string-array>
-  <string-array name="exercise_alert_range_strings" translatable="false"></string-array>
-  <string-array name="operator_defined_alert_range_strings" translatable="false"></string-array>
-  <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
-  <string-array name="etws_alerts_range_strings" translatable="false"></string-array>
-</resources>
diff --git a/res/values-mcc262-mnc01/config.xml b/res/values-mcc262-mnc01/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc262-mnc01/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc262-mnc06/config.xml b/res/values-mcc262-mnc06/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc262-mnc06/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc262/config.xml b/res/values-mcc262/config.xml
deleted file mode 100644
index 2687178..0000000
--- a/res/values-mcc262/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Disable emergency alerts -->
-    <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false"></string-array>
-    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
-    <string-array name="cmas_alerts_severe_range_strings" translatable="false"></string-array>
-    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"></string-array>
-    <string-array name="required_monthly_test_range_strings" translatable="false"></string-array>
-    <string-array name="exercise_alert_range_strings" translatable="false"></string-array>
-    <string-array name="operator_defined_alert_range_strings" translatable="false"></string-array>
-    <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
-    <string-array name="etws_alerts_range_strings" translatable="false"></string-array>
-</resources>
diff --git a/res/values-mcc286/config.xml b/res/values-mcc286/config.xml
index 402ee2f..083da0a 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 0000000..e3d2c84
--- /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-mcc294-mnc01/config.xml b/res/values-mcc294-mnc01/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc294-mnc01/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc297-mnc02/config.xml b/res/values-mcc297-mnc02/config.xml
new file mode 100644
index 0000000..7d35208
--- /dev/null
+++ b/res/values-mcc297-mnc02/config.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Main toggle default value -->
+    <bool name="master_toggle_enabled_default">false</bool>
+</resources>
diff --git a/res/values-mcc302-mnc610 b/res/values-mcc302-mnc610
new file mode 120000
index 0000000..114aaf5
--- /dev/null
+++ b/res/values-mcc302-mnc610
@@ -0,0 +1 @@
+values-mcc302-mnc64
\ No newline at end of file
diff --git a/res/values-mcc302-mnc630 b/res/values-mcc302-mnc630
new file mode 120000
index 0000000..114aaf5
--- /dev/null
+++ b/res/values-mcc302-mnc630
@@ -0,0 +1 @@
+values-mcc302-mnc64
\ No newline at end of file
diff --git a/res/values-mcc302-mnc64/config.xml b/res/values-mcc302-mnc64/config.xml
new file mode 100644
index 0000000..89fafb5
--- /dev/null
+++ b/res/values-mcc302-mnc64/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- 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-mnc640 b/res/values-mcc302-mnc640
new file mode 120000
index 0000000..114aaf5
--- /dev/null
+++ b/res/values-mcc302-mnc640
@@ -0,0 +1 @@
+values-mcc302-mnc64
\ No newline at end of file
diff --git a/res/values-mcc302/config.xml b/res/values-mcc302/config.xml
index 26b1b1a..7858937 100644
--- a/res/values-mcc302/config.xml
+++ b/res/values-mcc302/config.xml
@@ -15,6 +15,8 @@
 -->
 
 <resources>
+    <!-- Whether to show main switch settings at the top -->
+    <bool name="show_main_switch_settings">false</bool>
     <!-- Values that are active in the ListPreference.
          These must be a subset of the alert_reminder_interval_values list above. -->
     <string-array name="alert_reminder_interval_active_values" translatable="false">
@@ -48,4 +50,14 @@
         <item>500</item>
         <item>500</item>
      </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-mcc310-af/config.xml b/res/values-mcc310-af/config.xml
deleted file mode 100644
index 4530dc6..0000000
--- a/res/values-mcc310-af/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Ander toetse"</string>
-</resources>
diff --git a/res/values-mcc310-af/strings.xml b/res/values-mcc310-af/strings.xml
index 25b3adb..60979da 100644
--- a/res/values-mcc310-af/strings.xml
+++ b/res/values-mcc310-af/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spaans"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Ontvang wanneer moontlik noodwaarskuwings in Spaans"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Vee hierdie waarskuwing uit?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Vee alle waarskuwings wat ontvang is, uit?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Vee waarskuwing uit"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Vee waarskuwings uit"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Ontvang vereiste maandelikse toetse van die veiligheidwaarskuwingstelsel af"</string>
 </resources>
diff --git a/res/values-mcc310-am/config.xml b/res/values-mcc310-am/config.xml
deleted file mode 100644
index d9e1f1c..0000000
--- a/res/values-mcc310-am/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ሌሎች ሙከራዎች"</string>
-</resources>
diff --git a/res/values-mcc310-am/strings.xml b/res/values-mcc310-am/strings.xml
index 185f20b..2938943 100644
--- a/res/values-mcc310-am/strings.xml
+++ b/res/values-mcc310-am/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"ከደህንነት ማንቂያ ሥርዓቱ አስፈላጊ ወርሃዊ ሙከራዎችን ይቀበሉ"</string>
 </resources>
diff --git a/res/values-mcc310-ar/config.xml b/res/values-mcc310-ar/config.xml
deleted file mode 100644
index 6069aed..0000000
--- a/res/values-mcc310-ar/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"الاختبارات الأخرى"</string>
-</resources>
diff --git a/res/values-mcc310-ar/strings.xml b/res/values-mcc310-ar/strings.xml
index 6510cb2..5cbbbef 100644
--- a/res/values-mcc310-ar/strings.xml
+++ b/res/values-mcc310-ar/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"تلقّي الاختبارات الشهرية المطلوبة من نظام تنبيهات السلامة"</string>
 </resources>
diff --git a/res/values-mcc310-as/config.xml b/res/values-mcc310-as/config.xml
deleted file mode 100644
index 8dbba57..0000000
--- a/res/values-mcc310-as/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"অন্য পৰীক্ষাসমূহ"</string>
-</resources>
diff --git a/res/values-mcc310-as/strings.xml b/res/values-mcc310-as/strings.xml
index 7f48752..a7a6f8c 100644
--- a/res/values-mcc310-as/strings.xml
+++ b/res/values-mcc310-as/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"সুৰক্ষা সতৰ্কবাৰ্তা ছিষ্টেমৰ পৰা প্ৰয়োজনীয় মাহেকীয়া পৰীক্ষাসমূহ লাভ কৰক"</string>
 </resources>
diff --git a/res/values-mcc310-az/config.xml b/res/values-mcc310-az/config.xml
deleted file mode 100644
index 33cdf15..0000000
--- a/res/values-mcc310-az/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Digər sınaqlar"</string>
-</resources>
diff --git a/res/values-mcc310-az/strings.xml b/res/values-mcc310-az/strings.xml
index 8b497be..fb42040 100644
--- a/res/values-mcc310-az/strings.xml
+++ b/res/values-mcc310-az/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"İspan dili"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Mümkün olduqda fövqəladə hal ilə bağlı xəbərdarlıqları İspan dilində qəbul edin"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Bu xəbərdarlıq silinsin?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Qəbul olunmuş bütün xəbərdarlıqlar silinsin?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Xəbərdarlığı silin"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Xəbərdarlıqları silin"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Təhlükəsizlik siqnalı sistemindən tələb olunan aylıq sınaq bildirişləri alın"</string>
 </resources>
diff --git a/res/values-mcc310-b+sr+Latn/config.xml b/res/values-mcc310-b+sr+Latn/config.xml
deleted file mode 100644
index 12a8cfb..0000000
--- a/res/values-mcc310-b+sr+Latn/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Drugi testovi"</string>
-</resources>
diff --git a/res/values-mcc310-b+sr+Latn/strings.xml b/res/values-mcc310-b+sr+Latn/strings.xml
index 23d7c2d..a20acf2 100644
--- a/res/values-mcc310-b+sr+Latn/strings.xml
+++ b/res/values-mcc310-b+sr+Latn/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"španski"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Primajte obaveštenja o hitnim slučajevima na španskom kada je to moguće"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Želite da izbrišete ovo upozorenje?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Želite da izbrišete sva primljena obaveštenja?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Izbriši upozorenje"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Izbriši obaveštenja"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Primajte obavezne mesečne testove sistema bezbednosnih upozorenja"</string>
 </resources>
diff --git a/res/values-mcc310-be/config.xml b/res/values-mcc310-be/config.xml
deleted file mode 100644
index 3c48c0c..0000000
--- a/res/values-mcc310-be/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Іншыя тэсты"</string>
-</resources>
diff --git a/res/values-mcc310-be/strings.xml b/res/values-mcc310-be/strings.xml
index 3fa2bd8..26b9e76 100644
--- a/res/values-mcc310-be/strings.xml
+++ b/res/values-mcc310-be/strings.xml
@@ -16,6 +16,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Іспанская"</string>
+    <string name="receive_cmas_in_second_language_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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Штомесяц атрымліваць вынікі тэстаў ад сістэмы аховы бяспекі"</string>
 </resources>
diff --git a/res/values-mcc310-bg/config.xml b/res/values-mcc310-bg/config.xml
deleted file mode 100644
index 2e33e87..0000000
--- a/res/values-mcc310-bg/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Други тестове"</string>
-</resources>
diff --git a/res/values-mcc310-bg/strings.xml b/res/values-mcc310-bg/strings.xml
index eadef8d..fcaa8ee 100644
--- a/res/values-mcc310-bg/strings.xml
+++ b/res/values-mcc310-bg/strings.xml
@@ -16,6 +16,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"испански"</string>
+    <string name="receive_cmas_in_second_language_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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Получаване на задължителните месечни тестове от системата за сигнали за безопасност"</string>
 </resources>
diff --git a/res/values-mcc310-bn/config.xml b/res/values-mcc310-bn/config.xml
deleted file mode 100644
index 4e85e54..0000000
--- a/res/values-mcc310-bn/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"অন্য পরীক্ষা"</string>
-</resources>
diff --git a/res/values-mcc310-bn/strings.xml b/res/values-mcc310-bn/strings.xml
index b78a6cf..923a289 100644
--- a/res/values-mcc310-bn/strings.xml
+++ b/res/values-mcc310-bn/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"নিরাপত্তা সংক্রান্ত সতর্কতা সিস্টেম থেকে প্রয়োজনীয় মাসিক পরীক্ষার সতর্কতা পান"</string>
 </resources>
diff --git a/res/values-mcc310-bs/config.xml b/res/values-mcc310-bs/config.xml
deleted file mode 100644
index 12a8cfb..0000000
--- a/res/values-mcc310-bs/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Drugi testovi"</string>
-</resources>
diff --git a/res/values-mcc310-bs/strings.xml b/res/values-mcc310-bs/strings.xml
index 0718d68..22ea16d 100644
--- a/res/values-mcc310-bs/strings.xml
+++ b/res/values-mcc310-bs/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Španski"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Primajte upozorenja o vanrednim situacijama na španskom jeziku, kada je moguće"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Izbrisati ovo upozorenje?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Izbrisati sva primljena upozorenja?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Izbriši upozorenje"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Izbriši upozorenja"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Primanje obaveznih mjesečnih testova sistema sigurnosnih upozorenja"</string>
 </resources>
diff --git a/res/values-mcc310-ca/config.xml b/res/values-mcc310-ca/config.xml
deleted file mode 100644
index dbf9afb..0000000
--- a/res/values-mcc310-ca/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Altres proves"</string>
-</resources>
diff --git a/res/values-mcc310-ca/strings.xml b/res/values-mcc310-ca/strings.xml
index 34dc601..a679ade 100644
--- a/res/values-mcc310-ca/strings.xml
+++ b/res/values-mcc310-ca/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Espanyol"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Vull rebre les alertes d\'emergència en espanyol sempre que sigui possible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Vols suprimir aquesta alerta?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Vols suprimir totes les alertes rebudes?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Suprimeix l\'alerta"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Suprimeix les alertes"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Vull rebre les proves mensuals obligatòries del sistema d\'alertes de seguretat"</string>
 </resources>
diff --git a/res/values-mcc310-cs/config.xml b/res/values-mcc310-cs/config.xml
deleted file mode 100644
index 1c36e22..0000000
--- a/res/values-mcc310-cs/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Jiné testy"</string>
-</resources>
diff --git a/res/values-mcc310-cs/strings.xml b/res/values-mcc310-cs/strings.xml
index d069fe1..4588480 100644
--- a/res/values-mcc310-cs/strings.xml
+++ b/res/values-mcc310-cs/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"španělština"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Dostávat výstražné zprávy ve španělštině, bude-li to možné"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Smazat toto upozornění?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Smazat všechna přijatá upozornění?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Smazat upozornění"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Smazat upozornění"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Dostávat povinné měsíční testy ze systému bezpečnostních upozornění"</string>
 </resources>
diff --git a/res/values-mcc310-da/config.xml b/res/values-mcc310-da/config.xml
deleted file mode 100644
index 0f8544f..0000000
--- a/res/values-mcc310-da/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andre test"</string>
-</resources>
diff --git a/res/values-mcc310-da/strings.xml b/res/values-mcc310-da/strings.xml
index 37f188b..66e3fdc 100644
--- a/res/values-mcc310-da/strings.xml
+++ b/res/values-mcc310-da/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spansk"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Modtag nødalarmer på spansk, når det er muligt"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Vil du slette denne underretning?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Vil du slette alle de advarsler, du har modtaget?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Slet underretning"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Slet underretninger"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Modtag påkrævede månedlige tests fra systemet til sikkerhedsadvarsler"</string>
 </resources>
diff --git a/res/values-mcc310-de/config.xml b/res/values-mcc310-de/config.xml
deleted file mode 100644
index d3fd184..0000000
--- a/res/values-mcc310-de/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andere Tests"</string>
-</resources>
diff --git a/res/values-mcc310-de/strings.xml b/res/values-mcc310-de/strings.xml
index d1168e4..36503b8 100644
--- a/res/values-mcc310-de/strings.xml
+++ b/res/values-mcc310-de/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanisch"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Notfallbenachrichtigungen wenn möglich auf Spanisch erhalten"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Diese Warnmeldung löschen?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Alle empfangenen Warnmeldungen löschen?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Warnmeldung löschen"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Warnmeldungen löschen"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Erforderliche monatliche Tests vom Sicherheitswarnsystem erhalten"</string>
 </resources>
diff --git a/res/values-mcc310-el/config.xml b/res/values-mcc310-el/config.xml
deleted file mode 100644
index f457472..0000000
--- a/res/values-mcc310-el/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Άλλες δοκιμές"</string>
-</resources>
diff --git a/res/values-mcc310-el/strings.xml b/res/values-mcc310-el/strings.xml
index 998465c..b873895 100644
--- a/res/values-mcc310-el/strings.xml
+++ b/res/values-mcc310-el/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Λήψη υποχρεωτικών μηνιαίων δοκιμών από το σύστημα ειδοποιήσεων ασφαλείας"</string>
 </resources>
diff --git a/res/values-mcc310-en-rAU/config.xml b/res/values-mcc310-en-rAU/config.xml
deleted file mode 100644
index 9812864..0000000
--- a/res/values-mcc310-en-rAU/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Other tests"</string>
-</resources>
diff --git a/res/values-mcc310-en-rAU/strings.xml b/res/values-mcc310-en-rAU/strings.xml
index 6a4beb8..6492a21 100644
--- a/res/values-mcc310-en-rAU/strings.xml
+++ b/res/values-mcc310-en-rAU/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanish"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Receive emergency alerts in Spanish when possible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Delete this alert?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Delete all received alerts?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Delete alert"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Delete alerts"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Receive required monthly tests from the safety alert system"</string>
 </resources>
diff --git a/res/values-mcc310-en-rCA/config.xml b/res/values-mcc310-en-rCA/config.xml
deleted file mode 100644
index 9812864..0000000
--- a/res/values-mcc310-en-rCA/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Other tests"</string>
-</resources>
diff --git a/res/values-mcc310-en-rCA/strings.xml b/res/values-mcc310-en-rCA/strings.xml
index 6a4beb8..6492a21 100644
--- a/res/values-mcc310-en-rCA/strings.xml
+++ b/res/values-mcc310-en-rCA/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanish"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Receive emergency alerts in Spanish when possible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Delete this alert?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Delete all received alerts?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Delete alert"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Delete alerts"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Receive required monthly tests from the safety alert system"</string>
 </resources>
diff --git a/res/values-mcc310-en-rGB/config.xml b/res/values-mcc310-en-rGB/config.xml
deleted file mode 100644
index 9812864..0000000
--- a/res/values-mcc310-en-rGB/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Other tests"</string>
-</resources>
diff --git a/res/values-mcc310-en-rGB/strings.xml b/res/values-mcc310-en-rGB/strings.xml
index 6a4beb8..6492a21 100644
--- a/res/values-mcc310-en-rGB/strings.xml
+++ b/res/values-mcc310-en-rGB/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanish"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Receive emergency alerts in Spanish when possible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Delete this alert?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Delete all received alerts?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Delete alert"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Delete alerts"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Receive required monthly tests from the safety alert system"</string>
 </resources>
diff --git a/res/values-mcc310-en-rIN/config.xml b/res/values-mcc310-en-rIN/config.xml
deleted file mode 100644
index 9812864..0000000
--- a/res/values-mcc310-en-rIN/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Other tests"</string>
-</resources>
diff --git a/res/values-mcc310-en-rIN/strings.xml b/res/values-mcc310-en-rIN/strings.xml
index 6a4beb8..6492a21 100644
--- a/res/values-mcc310-en-rIN/strings.xml
+++ b/res/values-mcc310-en-rIN/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanish"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Receive emergency alerts in Spanish when possible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Delete this alert?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Delete all received alerts?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Delete alert"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Delete alerts"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Receive required monthly tests from the safety alert system"</string>
 </resources>
diff --git a/res/values-mcc310-en-rXC/config.xml b/res/values-mcc310-en-rXC/config.xml
deleted file mode 100644
index c41f6fb..0000000
--- a/res/values-mcc310-en-rXC/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎Other tests‎‏‎‎‏‎"</string>
-</resources>
diff --git a/res/values-mcc310-en-rXC/strings.xml b/res/values-mcc310-en-rXC/strings.xml
index 4deb221..babc526 100644
--- a/res/values-mcc310-en-rXC/strings.xml
+++ b/res/values-mcc310-en-rXC/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎Spanish‎‏‎‎‏‎"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎Receive emergency alerts in Spanish when possible‎‏‎‎‏‎"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎Delete this alert?‎‏‎‎‏‎"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎Delete all received alerts?‎‏‎‎‏‎"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎Delete alert‎‏‎‎‏‎"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎Delete alerts‎‏‎‎‏‎"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎Receive required monthly tests from the safety alert system‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-mcc310-es-rUS/config.xml b/res/values-mcc310-es-rUS/config.xml
deleted file mode 100644
index 446c25e..0000000
--- a/res/values-mcc310-es-rUS/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Otras pruebas"</string>
-</resources>
diff --git a/res/values-mcc310-es-rUS/strings.xml b/res/values-mcc310-es-rUS/strings.xml
index ff391db..9263e55 100644
--- a/res/values-mcc310-es-rUS/strings.xml
+++ b/res/values-mcc310-es-rUS/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Español"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Recibir alertas de emergencias en español siempre que sea posible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"¿Quieres borrar esta alerta?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"¿Quieres borrar todas las alertas que recibiste?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Borrar alerta"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Borrar alertas"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Recibir pruebas mensuales obligatorias del sistema de alertas de seguridad"</string>
 </resources>
diff --git a/res/values-mcc310-es/config.xml b/res/values-mcc310-es/config.xml
deleted file mode 100644
index 446c25e..0000000
--- a/res/values-mcc310-es/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Otras pruebas"</string>
-</resources>
diff --git a/res/values-mcc310-es/strings.xml b/res/values-mcc310-es/strings.xml
index 34932e0..317436a 100644
--- a/res/values-mcc310-es/strings.xml
+++ b/res/values-mcc310-es/strings.xml
@@ -17,5 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Español"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Recibir alertas de emergencia en español cuando sea posible"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Recibe alertas de emergencia en español cuando sea posible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"¿Eliminar esta alerta?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"¿Eliminar todas las alertas recibidas?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Eliminar alerta"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Eliminar alertas"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Recibir pruebas mensuales obligatorias del sistema de alertas de seguridad"</string>
 </resources>
diff --git a/res/values-mcc310-et/config.xml b/res/values-mcc310-et/config.xml
deleted file mode 100644
index 16c59b9..0000000
--- a/res/values-mcc310-et/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Muud testid"</string>
-</resources>
diff --git a/res/values-mcc310-et/strings.xml b/res/values-mcc310-et/strings.xml
index acdd721..73af781 100644
--- a/res/values-mcc310-et/strings.xml
+++ b/res/values-mcc310-et/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"hispaania"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Võimaluse korral saadetakse hispaaniakeelseid hädaolukorra teatisi"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Kas soovite selle hoiatuse kustutada?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Kas kustutada kõik saabunud hoiatused?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Kustuta hoiatus"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Kustuta hoiatused"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Turvahoiatussüsteem saadab igakuiseid nõutavaid teste"</string>
 </resources>
diff --git a/res/values-mcc310-eu/config.xml b/res/values-mcc310-eu/config.xml
deleted file mode 100644
index 37800d9..0000000
--- a/res/values-mcc310-eu/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Beste proba batzuk"</string>
-</resources>
diff --git a/res/values-mcc310-eu/strings.xml b/res/values-mcc310-eu/strings.xml
index 84e9cdd..afae62f 100644
--- a/res/values-mcc310-eu/strings.xml
+++ b/res/values-mcc310-eu/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Gaztelania"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Jaso larrialdi-alertak gaztelaniaz, ahal denean"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Alerta ezabatu nahi duzu?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Jasotako alerta guztiak ezabatu nahi dituzu?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Ezabatu alerta"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Ezabatu alertak"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Jaso beharrezkoak diren segurtasun-alerten sistemaren hileroko probak"</string>
 </resources>
diff --git a/res/values-mcc310-fa/config.xml b/res/values-mcc310-fa/config.xml
deleted file mode 100644
index d423089..0000000
--- a/res/values-mcc310-fa/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"آزمایش‌های دیگر"</string>
-</resources>
diff --git a/res/values-mcc310-fa/strings.xml b/res/values-mcc310-fa/strings.xml
index 0ab07f5..4b5da7b 100644
--- a/res/values-mcc310-fa/strings.xml
+++ b/res/values-mcc310-fa/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"دریافت آزمایش‌های ماهانه ضروری از سیستم هشدار ایمنی"</string>
 </resources>
diff --git a/res/values-mcc310-fi/config.xml b/res/values-mcc310-fi/config.xml
deleted file mode 100644
index 2d4b3b6..0000000
--- a/res/values-mcc310-fi/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Muut testit"</string>
-</resources>
diff --git a/res/values-mcc310-fi/strings.xml b/res/values-mcc310-fi/strings.xml
index cbc2ccf..19eb044 100644
--- a/res/values-mcc310-fi/strings.xml
+++ b/res/values-mcc310-fi/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"espanja"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Vastaanota hätähälytyksiä espanjaksi, kun mahdollista"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Poistetaanko tämä hälytys?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Poistetaanko kaikki vastaanotetut hälytykset?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Poista hälytys"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Poista hälytykset"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Vastaanota turvahälytysjärjestelmän pakollisia kuukausittaisia testejä"</string>
 </resources>
diff --git a/res/values-mcc310-fr-rCA/config.xml b/res/values-mcc310-fr-rCA/config.xml
deleted file mode 100644
index ecf378c..0000000
--- a/res/values-mcc310-fr-rCA/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Autres tests"</string>
-</resources>
diff --git a/res/values-mcc310-fr-rCA/strings.xml b/res/values-mcc310-fr-rCA/strings.xml
index 04a0dd9..7a6080a 100644
--- a/res/values-mcc310-fr-rCA/strings.xml
+++ b/res/values-mcc310-fr-rCA/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Espagnol"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Recevoir des alertes d\'urgence en espagnol lorsque c\'est possible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Supprimer cette alerte?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Supprimer toutes les alertes reçues?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Supprimer l\'alerte"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Supprimer les alertes"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Recevoir les tests mensuels requis du système d\'alertes de sécurité"</string>
 </resources>
diff --git a/res/values-mcc310-fr/config.xml b/res/values-mcc310-fr/config.xml
deleted file mode 100644
index ecf378c..0000000
--- a/res/values-mcc310-fr/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Autres tests"</string>
-</resources>
diff --git a/res/values-mcc310-fr/strings.xml b/res/values-mcc310-fr/strings.xml
index bf156f4..3a098ef 100644
--- a/res/values-mcc310-fr/strings.xml
+++ b/res/values-mcc310-fr/strings.xml
@@ -17,5 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Espagnol"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Si possible, recevoir des alertes d\'urgence en espagnol"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Recevoir les alertes d\'urgence en espagnol quand cela est possible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Supprimer cette alerte ?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Supprimer toutes les alertes reçues ?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Supprimer l\'alerte"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Supprimer les alertes"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Recevoir des tests mensuels requis depuis le système d\'alertes de sécurité"</string>
 </resources>
diff --git a/res/values-mcc310-gl/config.xml b/res/values-mcc310-gl/config.xml
deleted file mode 100644
index f671d3e..0000000
--- a/res/values-mcc310-gl/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Outras probas"</string>
-</resources>
diff --git a/res/values-mcc310-gl/strings.xml b/res/values-mcc310-gl/strings.xml
index b8be8d7..a4071b9 100644
--- a/res/values-mcc310-gl/strings.xml
+++ b/res/values-mcc310-gl/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Español"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Recibe alertas por emerxencias en español cando sexa posible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Queres eliminar esta alerta?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Queres eliminar todas as alertas recibidas?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Eliminar alerta"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Eliminar alertas"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Recibe as probas mensuais requiridas do sistema de alertas de seguranza"</string>
 </resources>
diff --git a/res/values-mcc310-gu/config.xml b/res/values-mcc310-gu/config.xml
deleted file mode 100644
index 022590b..0000000
--- a/res/values-mcc310-gu/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"અન્ય પરીક્ષણો"</string>
-</resources>
diff --git a/res/values-mcc310-gu/strings.xml b/res/values-mcc310-gu/strings.xml
index b78baae..da0faf9 100644
--- a/res/values-mcc310-gu/strings.xml
+++ b/res/values-mcc310-gu/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"સલામતી અલર્ટ સિસ્ટમમાંથી જરુરી માસિક પરીક્ષણો મેળવો"</string>
 </resources>
diff --git a/res/values-mcc310-hi/config.xml b/res/values-mcc310-hi/config.xml
deleted file mode 100644
index 08b81c1..0000000
--- a/res/values-mcc310-hi/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"अन्य टेस्ट"</string>
-</resources>
diff --git a/res/values-mcc310-hi/strings.xml b/res/values-mcc310-hi/strings.xml
index 128e1f6..2669e0a 100644
--- a/res/values-mcc310-hi/strings.xml
+++ b/res/values-mcc310-hi/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"सुरक्षा से जुड़ी चेतावनी देने वाले सिस्टम से हर महीने ज़रूरी टेस्ट अलर्ट पाएं"</string>
 </resources>
diff --git a/res/values-mcc310-hr/config.xml b/res/values-mcc310-hr/config.xml
deleted file mode 100644
index 12a8cfb..0000000
--- a/res/values-mcc310-hr/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Drugi testovi"</string>
-</resources>
diff --git a/res/values-mcc310-hr/strings.xml b/res/values-mcc310-hr/strings.xml
index 978d0b8..52b54a2 100644
--- a/res/values-mcc310-hr/strings.xml
+++ b/res/values-mcc310-hr/strings.xml
@@ -16,6 +16,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"španjolski"</string>
+    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Španjolski"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Primajte hitna upozorenja na španjolskom kad je moguće"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Želite li izbrisati ovo upozorenje?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Izbrisati sva primljena upozorenja?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Izbriši upozorenje"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Izbriši upozorenja"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Primajte potrebne mjesečne testove sustava sigurnosnih upozorenja"</string>
 </resources>
diff --git a/res/values-mcc310-hu/config.xml b/res/values-mcc310-hu/config.xml
deleted file mode 100644
index a1deea6..0000000
--- a/res/values-mcc310-hu/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Egyéb tesztek"</string>
-</resources>
diff --git a/res/values-mcc310-hu/strings.xml b/res/values-mcc310-hu/strings.xml
index 424bcb0..1559e09 100644
--- a/res/values-mcc310-hu/strings.xml
+++ b/res/values-mcc310-hu/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"spanyol"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Vészjelzések fogadása spanyol nyelven, amikor csak lehetséges"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Törli ezt az értesítést?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Biztosan törli az összes beérkező értesítést?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Értesítés törlése"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Értesítések törlése"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"A biztonsági figyelmeztető rendszer kötelező havi tesztjeinek fogadása"</string>
 </resources>
diff --git a/res/values-mcc310-hy/config.xml b/res/values-mcc310-hy/config.xml
deleted file mode 100644
index e66419a..0000000
--- a/res/values-mcc310-hy/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Այլ փորձնական ծանուցումներ"</string>
-</resources>
diff --git a/res/values-mcc310-hy/strings.xml b/res/values-mcc310-hy/strings.xml
index 177436c..3fc4696 100644
--- a/res/values-mcc310-hy/strings.xml
+++ b/res/values-mcc310-hy/strings.xml
@@ -16,6 +16,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"իսպաներեն"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Հնարավորության դեպքում ստանալ արտակարգ իրավիճակների ահազանգեր իսպաներենով"</string>
+    <string name="receive_cmas_in_second_language_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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Ստանալ ազդարարման համակարգի պարտադիր փորձնական ահազանգեր"</string>
 </resources>
diff --git a/res/values-mcc310-in/config.xml b/res/values-mcc310-in/config.xml
deleted file mode 100644
index 80370ab..0000000
--- a/res/values-mcc310-in/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Pengujian lainnya"</string>
-</resources>
diff --git a/res/values-mcc310-in/strings.xml b/res/values-mcc310-in/strings.xml
index 951d70c..9dfe44c 100644
--- a/res/values-mcc310-in/strings.xml
+++ b/res/values-mcc310-in/strings.xml
@@ -17,5 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanyol"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Menerima notifikasi darurat dalam bahasa Spanyol jika memungkinkan"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Menerima peringatan darurat dalam bahasa Spanyol jika memungkinkan"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Hapus notifikasi ini?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Hapus semua notifikasi yang diterima?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Hapus notifikasi"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Hapus notifikasi"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Terima pengujian bulanan wajib dari sistem peringatan keamanan"</string>
 </resources>
diff --git a/res/values-mcc310-is/config.xml b/res/values-mcc310-is/config.xml
deleted file mode 100644
index afbb8d7..0000000
--- a/res/values-mcc310-is/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Aðrar prófanir"</string>
-</resources>
diff --git a/res/values-mcc310-is/strings.xml b/res/values-mcc310-is/strings.xml
index 29c441f..250876a 100644
--- a/res/values-mcc310-is/strings.xml
+++ b/res/values-mcc310-is/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spænska"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Fá neyðartilkynningar á spænsku þegar það er hægt"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Eyða þessari viðvörun?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Viltu eyða öllum viðvörunum sem þú hefur móttekið?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Eyða viðvörun"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Eyða viðvörunum"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Fá áskildar mánaðarlegar prófanir frá öryggisviðvörunarkerfinu"</string>
 </resources>
diff --git a/res/values-mcc310-it/config.xml b/res/values-mcc310-it/config.xml
deleted file mode 100644
index ca70bc6..0000000
--- a/res/values-mcc310-it/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="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 001761f..43950fe 100644
--- a/res/values-mcc310-it/strings.xml
+++ b/res/values-mcc310-it/strings.xml
@@ -18,4 +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_all_broadcasts" msgid="4748571670736214158">"Vuoi eliminare tutti gli avvisi ricevuti?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Elimina avviso"</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>
 </resources>
diff --git a/res/values-mcc310-iw/config.xml b/res/values-mcc310-iw/config.xml
deleted file mode 100644
index 031cf16..0000000
--- a/res/values-mcc310-iw/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="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 52c530c..baacfb6 100644
--- a/res/values-mcc310-iw/strings.xml
+++ b/res/values-mcc310-iw/strings.xml
@@ -17,5 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"ספרדית"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"קבלת התרעות על מקרי חירום בספרדית כשזה אפשרי"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"קבלת התראות על מקרי חירום בספרדית כשזה אפשרי"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"למחוק את ההתראה הזו?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"למחוק את כל ההתראות שהתקבלו?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"מחיקת ההתראה"</string>
+    <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>
 </resources>
diff --git a/res/values-mcc310-ja/config.xml b/res/values-mcc310-ja/config.xml
deleted file mode 100644
index d8a2808..0000000
--- a/res/values-mcc310-ja/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"その他のテスト"</string>
-</resources>
diff --git a/res/values-mcc310-ja/strings.xml b/res/values-mcc310-ja/strings.xml
index 2748d52..e336d8f 100644
--- a/res/values-mcc310-ja/strings.xml
+++ b/res/values-mcc310-ja/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"安全警告システムの毎月のテスト(必須)を受信する"</string>
 </resources>
diff --git a/res/values-mcc310-ka/config.xml b/res/values-mcc310-ka/config.xml
deleted file mode 100644
index 22fa2b2..0000000
--- a/res/values-mcc310-ka/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"სხვა ტესტები"</string>
-</resources>
diff --git a/res/values-mcc310-ka/strings.xml b/res/values-mcc310-ka/strings.xml
index 55b1e31..b775d7b 100644
--- a/res/values-mcc310-ka/strings.xml
+++ b/res/values-mcc310-ka/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"სავალდებულო ყოველთვიური ტესტების მიღება უსაფრთხოების გაფრთხილებების სისტემიდან"</string>
 </resources>
diff --git a/res/values-mcc310-kk/config.xml b/res/values-mcc310-kk/config.xml
deleted file mode 100644
index d417a35..0000000
--- a/res/values-mcc310-kk/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Басқа сынақ ескертулері"</string>
-</resources>
diff --git a/res/values-mcc310-kk/strings.xml b/res/values-mcc310-kk/strings.xml
index ba5dd43..80a605d 100644
--- a/res/values-mcc310-kk/strings.xml
+++ b/res/values-mcc310-kk/strings.xml
@@ -17,5 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Испан"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Мүмкін болғанда төтенше жағдай ескертулерін испан тілінде алу"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Мүмкін болғанда, төтенше жағдай хабарландыруларын испан тілінде алу"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Осы ескерту жойылсын ба?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Барлық алынған хабарландырулар жойылсын ба?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Ескертуді жою"</string>
+    <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>
 </resources>
diff --git a/res/values-mcc310-km/config.xml b/res/values-mcc310-km/config.xml
deleted file mode 100644
index 56ef1a8..0000000
--- a/res/values-mcc310-km/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ការសាកល្បង​ផ្សេងទៀត"</string>
-</resources>
diff --git a/res/values-mcc310-km/strings.xml b/res/values-mcc310-km/strings.xml
index 48498e2..6bbad4e 100644
--- a/res/values-mcc310-km/strings.xml
+++ b/res/values-mcc310-km/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"ទទួលតេស្តប្រចាំខែ​ដែលចាំបាច់ពីប្រព័ន្ធ​ជូនដំណឹងផ្នែក​សុវត្ថិភាព"</string>
 </resources>
diff --git a/res/values-mcc310-kn/config.xml b/res/values-mcc310-kn/config.xml
deleted file mode 100644
index 78b6b42..0000000
--- a/res/values-mcc310-kn/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ಇತರ ಪರೀಕ್ಷೆಗಳು"</string>
-</resources>
diff --git a/res/values-mcc310-kn/strings.xml b/res/values-mcc310-kn/strings.xml
index fe5b2ce..20a30b0 100644
--- a/res/values-mcc310-kn/strings.xml
+++ b/res/values-mcc310-kn/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"ಸುರಕ್ಷತಾ ಎಚ್ಚರಿಕೆ ವ್ಯವಸ್ಥೆಯಿಂದ ಅಗತ್ಯವಾದ ಮಾಸಿಕ ಪರೀಕ್ಷೆಗಳನ್ನು ಸ್ವೀಕರಿಸಿ"</string>
 </resources>
diff --git a/res/values-mcc310-ko/config.xml b/res/values-mcc310-ko/config.xml
deleted file mode 100644
index 72ec9bc..0000000
--- a/res/values-mcc310-ko/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"기타 테스트"</string>
-</resources>
diff --git a/res/values-mcc310-ko/strings.xml b/res/values-mcc310-ko/strings.xml
index 81363eb..224c898 100644
--- a/res/values-mcc310-ko/strings.xml
+++ b/res/values-mcc310-ko/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"안전 경보 시스템의 필수 월간 테스트 받기"</string>
 </resources>
diff --git a/res/values-mcc310-ky/config.xml b/res/values-mcc310-ky/config.xml
deleted file mode 100644
index e2f7a7b..0000000
--- a/res/values-mcc310-ky/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="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 a03c7cd..8c77697 100644
--- a/res/values-mcc310-ky/strings.xml
+++ b/res/values-mcc310-ky/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <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
deleted file mode 100644
index c52dfd5..0000000
--- a/res/values-mcc310-lo/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ການທົດສອບອື່ນໆ"</string>
-</resources>
diff --git a/res/values-mcc310-lo/strings.xml b/res/values-mcc310-lo/strings.xml
index 193e363..340d73b 100644
--- a/res/values-mcc310-lo/strings.xml
+++ b/res/values-mcc310-lo/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"ຮັບການທົດສອບລາຍເດືອນທີ່ຈຳເປັນຈາກລະບົບການເຕືອນຄວາມປອດໄພ"</string>
 </resources>
diff --git a/res/values-mcc310-lt/config.xml b/res/values-mcc310-lt/config.xml
deleted file mode 100644
index b74985e..0000000
--- a/res/values-mcc310-lt/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Kiti bandymai"</string>
-</resources>
diff --git a/res/values-mcc310-lt/strings.xml b/res/values-mcc310-lt/strings.xml
index 0575d04..b8e5c69 100644
--- a/res/values-mcc310-lt/strings.xml
+++ b/res/values-mcc310-lt/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Ispanų"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Kai galima, gauti įspėjimus apie kritinę padėtį ispanų kalba"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Ištrinti šį įspėjimą?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Ištrinti visus gautus įspėjimus?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Ištrinti įspėjimą"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Ištrinti įspėjimus"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Gauti būtinus mėnesinius testus iš saugos įspėjimų sistemos"</string>
 </resources>
diff --git a/res/values-mcc310-lv/config.xml b/res/values-mcc310-lv/config.xml
deleted file mode 100644
index f43aad0..0000000
--- a/res/values-mcc310-lv/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Citi testi"</string>
-</resources>
diff --git a/res/values-mcc310-lv/strings.xml b/res/values-mcc310-lv/strings.xml
index 2080ff4..e4b8719 100644
--- a/res/values-mcc310-lv/strings.xml
+++ b/res/values-mcc310-lv/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spāņu"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Saņemt ārkārtas brīdinājumus spāņu valodā, kad iespējams"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Vai dzēst šo brīdinājumu?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Vai dzēst visus saņemtos brīdinājumus?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Dzēst brīdinājumu"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Dzēst brīdinājumus"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Saņemt nepieciešamos ikmēneša testus no drošības brīdinājumu sistēmas"</string>
 </resources>
diff --git a/res/values-mcc310-mk/config.xml b/res/values-mcc310-mk/config.xml
deleted file mode 100644
index 4a136cc..0000000
--- a/res/values-mcc310-mk/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Други тест-предупредувања"</string>
-</resources>
diff --git a/res/values-mcc310-mk/strings.xml b/res/values-mcc310-mk/strings.xml
index 961f075..73b9449 100644
--- a/res/values-mcc310-mk/strings.xml
+++ b/res/values-mcc310-mk/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Примај задолжителни месечни тест-пораки од безбедносниот систем за предупредување"</string>
 </resources>
diff --git a/res/values-mcc310-ml/config.xml b/res/values-mcc310-ml/config.xml
deleted file mode 100644
index accb00e..0000000
--- a/res/values-mcc310-ml/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"മറ്റ് പരിശോധനകൾ"</string>
-</resources>
diff --git a/res/values-mcc310-ml/strings.xml b/res/values-mcc310-ml/strings.xml
index 85959a3..3050796 100644
--- a/res/values-mcc310-ml/strings.xml
+++ b/res/values-mcc310-ml/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"സുരക്ഷാ മുന്നറിയിപ്പ് സംവിധാനത്തിൽ നിന്ന് ആവശ്യമായ പ്രതിമാസ പരിശോധനകൾ സ്വീകരിക്കുക"</string>
 </resources>
diff --git a/res/values-mcc310-mn/config.xml b/res/values-mcc310-mn/config.xml
deleted file mode 100644
index 0c3d1d5..0000000
--- a/res/values-mcc310-mn/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Бусад туршилт"</string>
-</resources>
diff --git a/res/values-mcc310-mn/strings.xml b/res/values-mcc310-mn/strings.xml
index 2057f7a..c8fb0d4 100644
--- a/res/values-mcc310-mn/strings.xml
+++ b/res/values-mcc310-mn/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Аюулгүй байдлын сэрэмжлүүлгийн системээс сар бүрийн шаардлагатай туршилтыг хүлээн авах"</string>
 </resources>
diff --git a/res/values-mcc310-mnc012/config.xml b/res/values-mcc310-mnc012/config.xml
index 2dffc0b..2ae463b 100644
--- a/res/values-mcc310-mnc012/config.xml
+++ b/res/values-mcc310-mnc012/config.xml
@@ -19,6 +19,12 @@
     <bool name="ignore_messages_in_ecbm">true</bool>
     <!-- Whether to disable cell broadcast severe alert when extreme alert is disabled -->
     <bool name="disable_severe_when_extreme_disabled">false</bool>
-    <!-- Whether to show test settings -->
+    <!-- U.S carrier want to show separate testing toggles for monthly test, operator defined and exercise -->
+    <!-- those testing toggles are visible after entering testing mode -->
+    <!-- Whether to show monthly test toggle when testing mode is off -->
     <bool name="show_test_settings">false</bool>
+    <!-- Whether to display operator defined test settings when testing mode is off. -->
+    <bool name="show_operator_defined_settings">false</bool>
+    <!-- Whether to display exercise test settings when testing mode is off. -->
+    <bool name="show_exercise_settings">false</bool>
 </resources>
diff --git a/res/values-mcc310-mnc120/config.xml b/res/values-mcc310-mnc120/config.xml
index a186552..9b27891 100644
--- a/res/values-mcc310-mnc120/config.xml
+++ b/res/values-mcc310-mnc120/config.xml
@@ -17,6 +17,12 @@
 <resources>
     <!-- Disable ETWS test channel for Sprint users -->
     <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
-    <!-- Whether to show test settings -->
+    <!-- U.S carrier want to show separate testing toggles for monthly test, operator defined and exercise -->
+    <!-- those testing toggles are visible after entering testing mode -->
+    <!-- Whether to show monthly test toggle when testing mode is off -->
     <bool name="show_test_settings">false</bool>
+    <!-- Whether to display operator defined test settings when testing mode is off. -->
+    <bool name="show_operator_defined_settings">false</bool>
+    <!-- Whether to display exercise test settings when testing mode is off. -->
+    <bool name="show_exercise_settings">false</bool>
 </resources>
diff --git a/res/values-mcc310-mnc160/config.xml b/res/values-mcc310-mnc160/config.xml
index 0d00a53..25033ec 100644
--- a/res/values-mcc310-mnc160/config.xml
+++ b/res/values-mcc310-mnc160/config.xml
@@ -17,9 +17,9 @@
 <resources>
     <!-- 4370, 4383 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, override_dnd=true</item>
+        <item>0x1112:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
         <!-- additional language -->
-        <item>0x111F:rat=gsm, emergency=true, override_dnd=true</item>
+        <item>0x111F:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
     </string-array>
 
     <!-- Whether to show CMAS messages by in a different order than received by prioritizing them -->
@@ -31,6 +31,12 @@
     <!-- Value of the first reminder interval in minutes. 0 means using one of the
          alert_reminder_interval_values for the interval of first reminder -->
     <integer name="first_reminder_interval_in_min">1</integer>
-    <!-- Whether to show test settings -->
+    <!-- U.S carrier want to show separate testing toggles for monthly test, operator defined and exercise -->
+    <!-- those testing toggles are visible after entering testing mode -->
+    <!-- Whether to show monthly test toggle when testing mode is off -->
     <bool name="show_test_settings">false</bool>
+    <!-- Whether to display operator defined test settings when testing mode is off. -->
+    <bool name="show_operator_defined_settings">false</bool>
+    <!-- Whether to display exercise test settings when testing mode is off. -->
+    <bool name="show_exercise_settings">false</bool>
 </resources>
diff --git a/res/values-mcc310-mnc410/config.xml b/res/values-mcc310-mnc410/config.xml
index 471ca1e..a7e36ad 100644
--- a/res/values-mcc310-mnc410/config.xml
+++ b/res/values-mcc310-mnc410/config.xml
@@ -17,10 +17,16 @@
 <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>
-    <!-- Whether to show test settings -->
+    <!-- AT&T want to show separate testing toggles for monthly test, operator defined and exercise -->
+    <!-- those testing toggles are visible after entering testing mode -->
+    <!-- Whether to show monthly test toggle when testing mode is off -->
     <bool name="show_test_settings">false</bool>
+    <!-- Whether to display operator defined test settings when testing mode is off. -->
+    <bool name="show_operator_defined_settings">false</bool>
+    <!-- Whether to display exercise test settings when testing mode is off. -->
+    <bool name="show_exercise_settings">false</bool>
 </resources>
diff --git a/res/values-mcc310-mr/config.xml b/res/values-mcc310-mr/config.xml
deleted file mode 100644
index 9eceacf..0000000
--- a/res/values-mcc310-mr/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"इतर चाचण्या"</string>
-</resources>
diff --git a/res/values-mcc310-mr/strings.xml b/res/values-mcc310-mr/strings.xml
index a9806fe..75b9dcc 100644
--- a/res/values-mcc310-mr/strings.xml
+++ b/res/values-mcc310-mr/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"सुरक्षितता सूचना सिस्टमकडून आवश्यक असलेल्या मासिक चाचण्या मिळवा"</string>
 </resources>
diff --git a/res/values-mcc310-ms/config.xml b/res/values-mcc310-ms/config.xml
deleted file mode 100644
index e0d6c8e..0000000
--- a/res/values-mcc310-ms/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Ujian lain"</string>
-</resources>
diff --git a/res/values-mcc310-ms/strings.xml b/res/values-mcc310-ms/strings.xml
index 32e35dd..0dfab78 100644
--- a/res/values-mcc310-ms/strings.xml
+++ b/res/values-mcc310-ms/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Sepanyol"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Menerima makluman kecemasan dalam bahasa Sepanyol jika boleh"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Padam makluman ini?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Padam semua makluman yang diterima?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Padam makluman"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Padam makluman"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Terima ujian bulanan yang diperlukan daripada sistem makluman keselamatan"</string>
 </resources>
diff --git a/res/values-mcc310-my/config.xml b/res/values-mcc310-my/config.xml
deleted file mode 100644
index bb61468..0000000
--- a/res/values-mcc310-my/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"အခြားစမ်းသပ်မှုများ"</string>
-</resources>
diff --git a/res/values-mcc310-my/strings.xml b/res/values-mcc310-my/strings.xml
index 9546566..80d76ad 100644
--- a/res/values-mcc310-my/strings.xml
+++ b/res/values-mcc310-my/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"လုံခြုံရေးသတိပေးချက်စနစ်မှ လိုအပ်သော လစဉ်စမ်းသပ်မှုများကို လက်ခံသည်"</string>
 </resources>
diff --git a/res/values-mcc310-nb/config.xml b/res/values-mcc310-nb/config.xml
deleted file mode 100644
index b64a003..0000000
--- a/res/values-mcc310-nb/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andre tester"</string>
-</resources>
diff --git a/res/values-mcc310-nb/strings.xml b/res/values-mcc310-nb/strings.xml
index 0fc9d24..e6654c0 100644
--- a/res/values-mcc310-nb/strings.xml
+++ b/res/values-mcc310-nb/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spansk"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Motta nødvarsler på spansk når det er mulig"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Vil du slette dette varselet?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Vil du slette alle mottatte varsler?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Slett varselet"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Slett varsler"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Motta obligatoriske månedlige tester fra systemet for sikkerhetsvarsling"</string>
 </resources>
diff --git a/res/values-mcc310-ne/config.xml b/res/values-mcc310-ne/config.xml
deleted file mode 100644
index eee2859..0000000
--- a/res/values-mcc310-ne/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"अन्य परीक्षणहरू"</string>
-</resources>
diff --git a/res/values-mcc310-ne/strings.xml b/res/values-mcc310-ne/strings.xml
index 7c1b929..79f933f 100644
--- a/res/values-mcc310-ne/strings.xml
+++ b/res/values-mcc310-ne/strings.xml
@@ -17,5 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"स्पेनी"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"सम्भव हुँदा आपत्कालीन अलर्टहरू स्पेनी भाषामा प्राप्त गर्नुहोस्"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"सम्भव हुँदा आपत्‌कालीन अलर्टहरू स्पेनी भाषामा प्राप्त गर्नुहोस्"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"यो अलर्ट मेटाउने हो?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"प्राप्त गरिएका सबै अलर्टहरू मेट्ने हो?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"अलर्ट मेटाउनुहोस्"</string>
+    <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>
 </resources>
diff --git a/res/values-mcc310-nl/config.xml b/res/values-mcc310-nl/config.xml
deleted file mode 100644
index b55b731..0000000
--- a/res/values-mcc310-nl/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andere tests"</string>
-</resources>
diff --git a/res/values-mcc310-nl/strings.xml b/res/values-mcc310-nl/strings.xml
index 547aa10..0910c7e 100644
--- a/res/values-mcc310-nl/strings.xml
+++ b/res/values-mcc310-nl/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spaans"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Noodmeldingen ontvangen in het Spaans, indien mogelijk"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Deze melding verwijderen?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Alle ontvangen meldingen verwijderen?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Melding verwijderen"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Meldingen verwijderen"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Vereiste maandelijkse tests van het noodsysteem voor veiligheidsmeldingen ontvangen"</string>
 </resources>
diff --git a/res/values-mcc310-or/config.xml b/res/values-mcc310-or/config.xml
deleted file mode 100644
index 6842d3d..0000000
--- a/res/values-mcc310-or/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ଅନ୍ୟ ପରୀକ୍ଷାଗୁଡ଼ିକ"</string>
-</resources>
diff --git a/res/values-mcc310-or/strings.xml b/res/values-mcc310-or/strings.xml
index d5d2a56..08f25f5 100644
--- a/res/values-mcc310-or/strings.xml
+++ b/res/values-mcc310-or/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"ସୁରକ୍ଷା ଆଲର୍ଟ ସିଷ୍ଟମରୁ ଆବଶ୍ୟକ ମାସିକ ପରୀକ୍ଷାଗୁଡ଼ିକୁ ପାଆନ୍ତୁ"</string>
 </resources>
diff --git a/res/values-mcc310-pa/config.xml b/res/values-mcc310-pa/config.xml
deleted file mode 100644
index 56faf4f..0000000
--- a/res/values-mcc310-pa/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ਹੋਰ ਜਾਂਚਾਂ"</string>
-</resources>
diff --git a/res/values-mcc310-pa/strings.xml b/res/values-mcc310-pa/strings.xml
index daa68b0..b9fc057 100644
--- a/res/values-mcc310-pa/strings.xml
+++ b/res/values-mcc310-pa/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"ਸੁਰੱਖਿਆ ਸੁਚੇਤਨਾ ਸਿਸਟਮ ਵੱਲੋਂ ਲੋੜੀਂਦੀਆਂ ਮਹੀਨਾਵਾਰ ਜਾਂਚਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
 </resources>
diff --git a/res/values-mcc310-pl/config.xml b/res/values-mcc310-pl/config.xml
deleted file mode 100644
index 6d72095..0000000
--- a/res/values-mcc310-pl/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Inne testy"</string>
-</resources>
diff --git a/res/values-mcc310-pl/strings.xml b/res/values-mcc310-pl/strings.xml
index f0fb253..2202b52 100644
--- a/res/values-mcc310-pl/strings.xml
+++ b/res/values-mcc310-pl/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Hiszpański"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Otrzymuj alerty bezpieczeństwa po hiszpańsku, jeśli są dostępne"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Usunąć ten alert?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Usunąć wszystkie odebrane alerty?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Usuń alert"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Usuń alerty"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Otrzymuj wymagane comiesięczne testy z systemu alertów bezpieczeństwa"</string>
 </resources>
diff --git a/res/values-mcc310-pt-rPT/config.xml b/res/values-mcc310-pt-rPT/config.xml
deleted file mode 100644
index 48b7a5d..0000000
--- a/res/values-mcc310-pt-rPT/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Outros testes"</string>
-</resources>
diff --git a/res/values-mcc310-pt-rPT/strings.xml b/res/values-mcc310-pt-rPT/strings.xml
index 5ac9062..f27bc8d 100644
--- a/res/values-mcc310-pt-rPT/strings.xml
+++ b/res/values-mcc310-pt-rPT/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Espanhol"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Receber alertas de emergência em espanhol sempre que possível"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Pretende eliminar este alerta?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Pretende eliminar todos os alertas recebidos?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Eliminar alerta"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Eliminar alertas"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Receber os testes mensais necessários do sistema de alerta de segurança"</string>
 </resources>
diff --git a/res/values-mcc310-pt/config.xml b/res/values-mcc310-pt/config.xml
deleted file mode 100644
index 48b7a5d..0000000
--- a/res/values-mcc310-pt/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Outros testes"</string>
-</resources>
diff --git a/res/values-mcc310-pt/strings.xml b/res/values-mcc310-pt/strings.xml
index 2477f64..82935e2 100644
--- a/res/values-mcc310-pt/strings.xml
+++ b/res/values-mcc310-pt/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Espanhol"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Receber alertas de emergência em espanhol quando possível"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Excluir este alerta?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Excluir todos os alertas recebidos?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Excluir alerta"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Excluir alertas"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Receber os testes mensais obrigatórios pelo sistema de alerta de segurança"</string>
 </resources>
diff --git a/res/values-mcc310-ro/config.xml b/res/values-mcc310-ro/config.xml
deleted file mode 100644
index f931233..0000000
--- a/res/values-mcc310-ro/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Alte teste"</string>
-</resources>
diff --git a/res/values-mcc310-ro/strings.xml b/res/values-mcc310-ro/strings.xml
index e105699..29dfa39 100644
--- a/res/values-mcc310-ro/strings.xml
+++ b/res/values-mcc310-ro/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spaniolă"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Trimite alerte de urgență în limba spaniolă dacă este posibil"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Ștergeți această alertă?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Ștergeți toate alertele primite?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Ștergeți alerta"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Ștergeți alertele"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Primiți teste lunare obligatorii de la sistemul de alerte de siguranță"</string>
 </resources>
diff --git a/res/values-mcc310-ru/config.xml b/res/values-mcc310-ru/config.xml
deleted file mode 100644
index f8b115f..0000000
--- a/res/values-mcc310-ru/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="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 ab2debd..1caab90 100644
--- a/res/values-mcc310-ru/strings.xml
+++ b/res/values-mcc310-ru/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <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
deleted file mode 100644
index 894fb41..0000000
--- a/res/values-mcc310-si/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"වෙනත් පරීක්ෂා"</string>
-</resources>
diff --git a/res/values-mcc310-si/strings.xml b/res/values-mcc310-si/strings.xml
index ec41faa..babb39d 100644
--- a/res/values-mcc310-si/strings.xml
+++ b/res/values-mcc310-si/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"ආරක්ෂක ඇඟවීමේ පද්ධතියෙන් මාසික පරීක්ෂා ලබා ගන්න"</string>
 </resources>
diff --git a/res/values-mcc310-sk/config.xml b/res/values-mcc310-sk/config.xml
deleted file mode 100644
index 9d4965c..0000000
--- a/res/values-mcc310-sk/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Iné testy"</string>
-</resources>
diff --git a/res/values-mcc310-sk/strings.xml b/res/values-mcc310-sk/strings.xml
index 3ecfb35..73f3716 100644
--- a/res/values-mcc310-sk/strings.xml
+++ b/res/values-mcc310-sk/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Španielčina"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Dostávať tiesňové upozornenia v španielčine (keď je to možné)"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Chcete odstrániť toto upozornenie?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Chcete odstrániť všetky prijaté upozornenia?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Odstrániť upozornenie"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Odstrániť upozornenia"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Dostávať požadované mesačné testy zo systému bezpečnostných upozornení"</string>
 </resources>
diff --git a/res/values-mcc310-sl/config.xml b/res/values-mcc310-sl/config.xml
deleted file mode 100644
index bfaaf91..0000000
--- a/res/values-mcc310-sl/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Drugi preizkusi"</string>
-</resources>
diff --git a/res/values-mcc310-sl/strings.xml b/res/values-mcc310-sl/strings.xml
index 9223e01..ac85d61 100644
--- a/res/values-mcc310-sl/strings.xml
+++ b/res/values-mcc310-sl/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"španščina"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Prejemanje nujnih opozoril v španščini, kadar je to mogoče"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Želite izbrisati to opozorilo?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Želite izbrisati vsa prejeta opozorila?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Izbriši opozorilo"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Izbriši opozorila"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Prejemanje obveznih mesečnih preizkusov iz sistema varnostnih opozoril"</string>
 </resources>
diff --git a/res/values-mcc310-sq/config.xml b/res/values-mcc310-sq/config.xml
deleted file mode 100644
index dd5525b..0000000
--- a/res/values-mcc310-sq/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Testet e tjera"</string>
-</resources>
diff --git a/res/values-mcc310-sq/strings.xml b/res/values-mcc310-sq/strings.xml
index f0f7469..b1bd41b 100644
--- a/res/values-mcc310-sq/strings.xml
+++ b/res/values-mcc310-sq/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"spanjisht"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Merri sinjalizimet e urgjencës në spanjisht kur është e mundur"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Do ta fshish këtë sinjalizim?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Do t\'i fshish të gjitha sinjalizimet e marra?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Fshi sinjalizimin"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Fshi sinjalizimet"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Merr testet mujore të kërkuara nga sistemi i sinjalizimeve të sigurisë"</string>
 </resources>
diff --git a/res/values-mcc310-sr/config.xml b/res/values-mcc310-sr/config.xml
deleted file mode 100644
index d7570e1..0000000
--- a/res/values-mcc310-sr/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Други тестови"</string>
-</resources>
diff --git a/res/values-mcc310-sr/strings.xml b/res/values-mcc310-sr/strings.xml
index a316c9b..2ace1bd 100644
--- a/res/values-mcc310-sr/strings.xml
+++ b/res/values-mcc310-sr/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Примајте обавезне месечне тестове система безбедносних упозорења"</string>
 </resources>
diff --git a/res/values-mcc310-sv/config.xml b/res/values-mcc310-sv/config.xml
deleted file mode 100644
index d245f7b..0000000
--- a/res/values-mcc310-sv/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Andra tester"</string>
-</resources>
diff --git a/res/values-mcc310-sv/strings.xml b/res/values-mcc310-sv/strings.xml
index d702c1d..fbbe0d0 100644
--- a/res/values-mcc310-sv/strings.xml
+++ b/res/values-mcc310-sv/strings.xml
@@ -16,6 +16,13 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"spanska"</string>
+    <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanska"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Ta emot varningar på spanska vid nödsituationer när det är möjligt"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Vill du radera varningen?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Vill du radera alla mottagna varningar?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Radera varning"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Radera varningar"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Ta emot månadstester från systemet för säkerhetsvarningar"</string>
 </resources>
diff --git a/res/values-mcc310-sw/config.xml b/res/values-mcc310-sw/config.xml
deleted file mode 100644
index b470296..0000000
--- a/res/values-mcc310-sw/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Majaribio mengine"</string>
-</resources>
diff --git a/res/values-mcc310-sw/strings.xml b/res/values-mcc310-sw/strings.xml
index 3a93b52..605a322 100644
--- a/res/values-mcc310-sw/strings.xml
+++ b/res/values-mcc310-sw/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Kihispania"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Pokea arifa za dharura katika Kihispania inapowezekana"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Ungependa kufuta arifa hii?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Ungependa kufuta arifa zote ulizopokea?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Futa arifa"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Futa arifa"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Pokea majaribio ya kila mwezi yanayohitajika kutoka mfumo wa arifa za usalama"</string>
 </resources>
diff --git a/res/values-mcc310-ta/config.xml b/res/values-mcc310-ta/config.xml
deleted file mode 100644
index 54d9ef6..0000000
--- a/res/values-mcc310-ta/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"பிற சோதனைகள்"</string>
-</resources>
diff --git a/res/values-mcc310-ta/strings.xml b/res/values-mcc310-ta/strings.xml
index f1a63f1..53219e2 100644
--- a/res/values-mcc310-ta/strings.xml
+++ b/res/values-mcc310-ta/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"தேவைப்படும் மாதாந்திரச் சோதனைகளைப் பாதுகாப்பு விழிப்பூட்டல் அமைப்பிலிருந்து பெறுக"</string>
 </resources>
diff --git a/res/values-mcc310-te/config.xml b/res/values-mcc310-te/config.xml
deleted file mode 100644
index 508d9a1..0000000
--- a/res/values-mcc310-te/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"ఇతర పరీక్షలు"</string>
-</resources>
diff --git a/res/values-mcc310-te/strings.xml b/res/values-mcc310-te/strings.xml
index 9e4389b..e3b97ba 100644
--- a/res/values-mcc310-te/strings.xml
+++ b/res/values-mcc310-te/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"భద్రతా అలర్ట్ సిస్టమ్ నుండి అవసరమైన నెలవారీ పరీక్షలను స్వీకరించండి"</string>
 </resources>
diff --git a/res/values-mcc310-th/config.xml b/res/values-mcc310-th/config.xml
deleted file mode 100644
index eabeca2..0000000
--- a/res/values-mcc310-th/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"การทดสอบอื่นๆ"</string>
-</resources>
diff --git a/res/values-mcc310-th/strings.xml b/res/values-mcc310-th/strings.xml
index bcd8c67..bbdab3e 100644
--- a/res/values-mcc310-th/strings.xml
+++ b/res/values-mcc310-th/strings.xml
@@ -17,5 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"สเปน"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"รับการแจ้งเตือนฉุกเฉินเป็นภาษาสเปนเมื่อเป็นไปได้"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"รับการแจ้งเตือนเหตุฉุกเฉินเป็นภาษาสเปนเมื่อเป็นไปได้"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"ลบการแจ้งเตือนนี้ไหม"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"ลบการแจ้งเตือนที่ได้รับทั้งหมดไหม"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"ลบการแจ้งเตือน"</string>
+    <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>
 </resources>
diff --git a/res/values-mcc310-tl/config.xml b/res/values-mcc310-tl/config.xml
deleted file mode 100644
index 07751f6..0000000
--- a/res/values-mcc310-tl/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Iba pang pagsubok"</string>
-</resources>
diff --git a/res/values-mcc310-tl/strings.xml b/res/values-mcc310-tl/strings.xml
index 7ff0327..5604b47 100644
--- a/res/values-mcc310-tl/strings.xml
+++ b/res/values-mcc310-tl/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Spanish"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Makatanggap ng mga alerto sa emergency na nasa wikang Spanish kapag posible"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"I-delete ang alertong ito?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"I-delete ang lahat ng natanggap na alerto?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"I-delete ang alerto"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"I-delete ang mga alerto"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Makatanggap ng mga kinakailangang buwanang pagsubok mula sa system ng alerto sa kaligtasan"</string>
 </resources>
diff --git a/res/values-mcc310-tr/config.xml b/res/values-mcc310-tr/config.xml
deleted file mode 100644
index 0b789c6..0000000
--- a/res/values-mcc310-tr/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Diğer testler"</string>
-</resources>
diff --git a/res/values-mcc310-tr/strings.xml b/res/values-mcc310-tr/strings.xml
index 5a4fa10..b48d65b 100644
--- a/res/values-mcc310-tr/strings.xml
+++ b/res/values-mcc310-tr/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"İspanyolca"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Mümkün olduğunda acil durum uyarılarını İspanyolca alın"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Bu uyarı silinsin mi?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Alınan tüm uyarılar silinsin mi?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Uyarıyı sil"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Uyarıları silme"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Gereken aylık testleri güvenlik uyarı sisteminden al"</string>
 </resources>
diff --git a/res/values-mcc310-uk/config.xml b/res/values-mcc310-uk/config.xml
deleted file mode 100644
index eb5e8d7..0000000
--- a/res/values-mcc310-uk/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Інші тестові сповіщення"</string>
-</resources>
diff --git a/res/values-mcc310-uk/strings.xml b/res/values-mcc310-uk/strings.xml
index 7bc4149..8a50e50 100644
--- a/res/values-mcc310-uk/strings.xml
+++ b/res/values-mcc310-uk/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Отримувати обов\'язкові щомісячні тестові сповіщення від системи безпеки"</string>
 </resources>
diff --git a/res/values-mcc310-ur/config.xml b/res/values-mcc310-ur/config.xml
deleted file mode 100644
index 5138de0..0000000
--- a/res/values-mcc310-ur/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"دیگر ٹیسٹس"</string>
-</resources>
diff --git a/res/values-mcc310-ur/strings.xml b/res/values-mcc310-ur/strings.xml
index 37888c4..7708528 100644
--- a/res/values-mcc310-ur/strings.xml
+++ b/res/values-mcc310-ur/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"حفاظتی الرٹ سسٹم سے مطلوبہ ماہانہ ٹیسٹس موصول کریں"</string>
 </resources>
diff --git a/res/values-mcc310-uz/config.xml b/res/values-mcc310-uz/config.xml
deleted file mode 100644
index 92b934a..0000000
--- a/res/values-mcc310-uz/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Boshqa sinov xabarlar"</string>
-</resources>
diff --git a/res/values-mcc310-uz/strings.xml b/res/values-mcc310-uz/strings.xml
index 78a346e..21f27cc 100644
--- a/res/values-mcc310-uz/strings.xml
+++ b/res/values-mcc310-uz/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Ispan"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Imkoni boʻlsa, favqulodda ogohlantirishlar Ispan tilida kelsin"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Bu bildirishnoma oʻchirilsinmi?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Barcha qabul qilingan ogohlantirishlar oʻchirilsinmi?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Bildirishnoma oʻchirilsinmi"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Bildirishnomalarni oʻchirish"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Xavfsizlik tizimi uchun majburiy oylik sinov xabarlarini olish"</string>
 </resources>
diff --git a/res/values-mcc310-vi/config.xml b/res/values-mcc310-vi/config.xml
deleted file mode 100644
index b598caa..0000000
--- a/res/values-mcc310-vi/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="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-vi/strings.xml b/res/values-mcc310-vi/strings.xml
index 11e877d..dc66f92 100644
--- a/res/values-mcc310-vi/strings.xml
+++ b/res/values-mcc310-vi/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Tiếng Việt"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Nhận cảnh báo khẩn cấp bằng tiếng Việt khi có thể"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Xóa cảnh báo này?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Xóa tất cả cảnh báo đã nhận?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Xóa cảnh báo"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Xóa cảnh báo"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Nhận cảnh báo thử nghiệm bắt buộc hằng tháng của hệ thống cảnh báo an toàn"</string>
 </resources>
diff --git a/res/values-mcc310-zh-rCN/config.xml b/res/values-mcc310-zh-rCN/config.xml
deleted file mode 100644
index ffac071..0000000
--- a/res/values-mcc310-zh-rCN/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"其他测试"</string>
-</resources>
diff --git a/res/values-mcc310-zh-rCN/strings.xml b/res/values-mcc310-zh-rCN/strings.xml
index 3978c01..7ca637d 100644
--- a/res/values-mcc310-zh-rCN/strings.xml
+++ b/res/values-mcc310-zh-rCN/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"接收安全警报系统发出的必需的每月测试消息"</string>
 </resources>
diff --git a/res/values-mcc310-zh-rHK/config.xml b/res/values-mcc310-zh-rHK/config.xml
deleted file mode 100644
index e1b4132..0000000
--- a/res/values-mcc310-zh-rHK/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"其他測試"</string>
-</resources>
diff --git a/res/values-mcc310-zh-rHK/strings.xml b/res/values-mcc310-zh-rHK/strings.xml
index c5df06d..0d79d6b 100644
--- a/res/values-mcc310-zh-rHK/strings.xml
+++ b/res/values-mcc310-zh-rHK/strings.xml
@@ -17,5 +17,12 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"西班牙文"</string>
-    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"接收西班牙文的緊急警示 (如有的話)"</string>
+    <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"接收西班牙文的緊急警示 (如有)"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"要刪除這個警示嗎?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"要刪除所有收到的警示嗎?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"刪除警示"</string>
+    <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>
 </resources>
diff --git a/res/values-mcc310-zh-rTW/config.xml b/res/values-mcc310-zh-rTW/config.xml
deleted file mode 100644
index e1b4132..0000000
--- a/res/values-mcc310-zh-rTW/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"其他測試"</string>
-</resources>
diff --git a/res/values-mcc310-zh-rTW/strings.xml b/res/values-mcc310-zh-rTW/strings.xml
index 62cbaca..047f99f 100644
--- a/res/values-mcc310-zh-rTW/strings.xml
+++ b/res/values-mcc310-zh-rTW/strings.xml
@@ -18,4 +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>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"接收安全性警示系統發出的每月測試訊息"</string>
 </resources>
diff --git a/res/values-mcc310-zu/config.xml b/res/values-mcc310-zu/config.xml
deleted file mode 100644
index 8bcc3bf..0000000
--- a/res/values-mcc310-zu/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_test_alerts_title" msgid="7215672102140788183">"Okunye ukuhlolwa"</string>
-</resources>
diff --git a/res/values-mcc310-zu/strings.xml b/res/values-mcc310-zu/strings.xml
index fd4f664..139707d 100644
--- a/res/values-mcc310-zu/strings.xml
+++ b/res/values-mcc310-zu/strings.xml
@@ -18,4 +18,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="receive_cmas_in_second_language_title" msgid="7539080017840218665">"Isi-Spanish"</string>
     <string name="receive_cmas_in_second_language_summary" msgid="4482209573334686904">"Thola izexwayiso zesimo esiphuthumayo nge-Spanish uma kukhonakala"</string>
+    <string name="confirm_delete_broadcast" msgid="6808374217554967811">"Susa lesi sexwayiso?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="4748571670736214158">"Susa zonke izexwayiso ozitholile?"</string>
+    <string name="menu_delete" msgid="2691868773984777519">"Susa isexwayiso"</string>
+    <string name="menu_delete_all" msgid="8991615021908376216">"Susa izexwayiso"</string>
+    <!-- no translation found for enable_cmas_test_alerts_title (3722503121618497385) -->
+    <skip />
+    <string name="enable_cmas_test_alerts_summary" msgid="6138676147687910935">"Thola izivivinyo ezidingekile zangenyanga ezivela kusistimu yesexwayiso sokuphepha"</string>
 </resources>
diff --git a/res/values-mcc310/config.xml b/res/values-mcc310/config.xml
index 18d6b24..c89f986 100644
--- a/res/values-mcc310/config.xml
+++ b/res/values-mcc310/config.xml
@@ -19,10 +19,10 @@
     <string name="emergency_alert_second_language_code" translatable="false">es</string>
     <!-- 4370, 4383 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true</item>
-        <item>0x1000:rat=cdma, emergency=true</item>
+        <item>0x1112:rat=gsm, emergency=true, always_on=true</item>
+        <item>0x1000:rat=cdma, emergency=true, always_on=true</item>
         <!-- additional language -->
-        <item>0x111F:rat=gsm, emergency=true, filter_language=true</item>
+        <item>0x111F:rat=gsm, emergency=true, filter_language=true, always_on=true</item>
     </string-array>
     <!-- 4371~4372, 4384~4385 -->
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
@@ -91,4 +91,9 @@
 
     <!-- Whether to enable alert handling during active voice call. -->
     <bool name="enable_alert_handling_during_call">true</bool>
+    <!-- U.S carriers want to show separate testing toggles for monthly test, operator defined and exercise -->
+    <!-- whether to display a separate operator defined test settings. today, most of time, operator defined channels was controlled by the main test toggle. -->
+    <bool name="show_separate_operator_defined_settings">true</bool>
+    <!-- whether to display a separate exercise test settings. today, most of time, exercise channels was controlled by the main test toggle. -->
+    <bool name="show_separate_exercise_settings">true</bool>
 </resources>
diff --git a/res/values-mcc310/strings.xml b/res/values-mcc310/strings.xml
index 3de2b09..545f238 100644
--- a/res/values-mcc310/strings.xml
+++ b/res/values-mcc310/strings.xml
@@ -16,8 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Preference title for other test alerts checkbox. [CHAR LIMIT=50] -->
-    <string name="enable_cmas_test_alerts_title">Other tests</string>
 
     <!-- Show additional language on/off switch in settings -->
     <!-- Preference title for enable CMAS second language checkbox. [CHAR LIMIT=50] -->
@@ -32,4 +30,14 @@
     <string name="menu_delete">Delete alert</string>
     <!-- Menu item for deleting all alerts. [CHAR LIMIT=30] -->
     <string name="menu_delete_all">Delete alerts</string>
+    <!-- Preference title for required monthly alerts checkbox. [CHAR LIMIT=50] -->
+    <!-- U.S. carriers want to show separate toggles for required month test, operator defined and exercise rather than a combined "Other test" toggle -->
+    <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">Receive required monthly tests from the safety alert system</string>
+    <!-- Show checkbox for National alerts in settings -->
+    <!-- Preference title for enable National threat alerts checkbox. [CHAR LIMIT=40] -->
+    <string name="cmas_presidential_level_alert">National alert</string>
+    <!-- Show CMAS opt-out dialog on first non-national alert. [CHAR LIMIT=100] -->
+    <string name="show_cmas_opt_out_summary">Show an opt-out dialog after displaying the first alert (other than National alert).</string>
 </resources>
diff --git a/res/values-mcc313-mnc790 b/res/values-mcc313-mnc790
new file mode 120000
index 0000000..78e6503
--- /dev/null
+++ b/res/values-mcc313-mnc790
@@ -0,0 +1 @@
+values-mcc310-mnc410
\ No newline at end of file
diff --git a/res/values-mcc330/config.xml b/res/values-mcc330/config.xml
new file mode 100644
index 0000000..07f7b90
--- /dev/null
+++ b/res/values-mcc330/config.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+  <!-- 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-mcc334-mnc03/config.xml b/res/values-mcc334-mnc03/config.xml
deleted file mode 100644
index 356319d..0000000
--- a/res/values-mcc334-mnc03/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <!-- Channel 50 for area update info -->
-        <item>0x032:type=area, emergency=false</item>
-    </string-array>
-    <!-- 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-mcc334-mnc030/config.xml b/res/values-mcc334-mnc030/config.xml
deleted file mode 100644
index 356319d..0000000
--- a/res/values-mcc334-mnc030/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <string-array name="additional_cbs_channels_strings" translatable="false">
-        <!-- Channel 50 for area update info -->
-        <item>0x032:type=area, emergency=false</item>
-    </string-array>
-    <!-- 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-mcc334/config.xml b/res/values-mcc334/config.xml
index bdaf3a8..6feb788 100644
--- a/res/values-mcc334/config.xml
+++ b/res/values-mcc334/config.xml
@@ -15,20 +15,25 @@
 -->
 
 <resources>
-    <!-- Channel 4370 -->
+    <!-- Channel 4370, 4383 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, alert_duration=86400000</item>
+        <item>0x1112:rat=gsm, emergency=true, alert_duration=86400000, always_on=true</item>
+        <item>0x111F:rat=gsm, emergency=true, alert_duration=86400000, always_on=true</item>
     </string-array>
 
-    <!-- Channel 50 and 919 -->
+    <!-- Channel 50, 919, 6400, and 4396-4399 -->
     <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>
+        <!-- Channel 6400 for Information messages -->
+        <item>0x1900:rat=gsm, emergency=false</item>
+        <!-- Channel 4396-4399 reserved for future -->
+        <item>0x112C-0x112F:rat=gsm, emergency=true</item>
     </string-array>
 
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">true</bool>
+    <bool name="override_dnd">true</bool>
 
     <!-- Link method -->
     <string name="link_method" translatable="false">none</string>
diff --git a/res/values-mcc400/config.xml b/res/values-mcc400/config.xml
new file mode 100644
index 0000000..662025a
--- /dev/null
+++ b/res/values-mcc400/config.xml
@@ -0,0 +1,35 @@
+<?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>
+    <bool name="show_main_switch_settings">false</bool>
+    <!-- Amber alerts toggle default value -->
+    <bool name="amber_alerts_enabled_default">false</bool>
+    <!-- Whether to show extreme alert settings -->
+    <bool name="show_extreme_alert_settings">false</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>
+        <!-- additional language -->
+        <item>0x111F:rat=gsm, emergency=true, always_on=true, override_dnd=true</item>
+    </string-array>
+    <!-- 4371~4372, 4384~4385 -->
+    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
+        <item>0x1113-0x1114:rat=gsm, emergency=true, always_on=true</item>
+        <!-- additional language -->
+        <item>0x1120-0x1121:rat=gsm, emergency=true, always_on=true</item>
+    </string-array>
+</resources>
diff --git a/res/values-mcc420-af/strings.xml b/res/values-mcc420-af/strings.xml
index b44a660..81f3c0d 100644
--- a/res/values-mcc420-af/strings.xml
+++ b/res/values-mcc420-af/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Waarskuwings"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Waarskuwings"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Aanbeveelde handelinge wat lewens of eiendom kan red"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Toetswaarskuwings"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Toetswaarskuwings"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Oefeninge"</string>
 </resources>
diff --git a/res/values-mcc420-am/strings.xml b/res/values-mcc420-am/strings.xml
index 32a369e..bb6a97d 100644
--- a/res/values-mcc420-am/strings.xml
+++ b/res/values-mcc420-am/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"የሙከራ ማንቂያዎች"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"የሙከራ ማንቂያዎች"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ልምምዶች"</string>
 </resources>
diff --git a/res/values-mcc420-ar/strings.xml b/res/values-mcc420-ar/strings.xml
index 59dac7e..e41dda9 100644
--- a/res/values-mcc420-ar/strings.xml
+++ b/res/values-mcc420-ar/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"تنبيهات اختبار"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"تنبيهات الاختبار"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"تدريبات"</string>
 </resources>
diff --git a/res/values-mcc420-as/strings.xml b/res/values-mcc420-as/strings.xml
index 5865ba0..c233cc4 100644
--- a/res/values-mcc420-as/strings.xml
+++ b/res/values-mcc420-as/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"পৰীক্ষণ সতৰ্কবার্তাসমূহ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"পৰীক্ষণৰ বাবে ব্যৱহৃত সতৰ্কবাৰ্তা"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"অনুশীলনসমূহ"</string>
 </resources>
diff --git a/res/values-mcc420-az/strings.xml b/res/values-mcc420-az/strings.xml
index 626ec5b..308afee 100644
--- a/res/values-mcc420-az/strings.xml
+++ b/res/values-mcc420-az/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Siqnallar"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Siqnallar"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Həyat və ya mülkiyyətin qorunması ilə bağlı məsləhətli əməliyyatlar"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Siqnalları sınayın"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Test Siqnalları"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Məşqlər"</string>
 </resources>
diff --git a/res/values-mcc420-b+sr+Latn/strings.xml b/res/values-mcc420-b+sr+Latn/strings.xml
index 8c99356..2335cf0 100644
--- a/res/values-mcc420-b+sr+Latn/strings.xml
+++ b/res/values-mcc420-b+sr+Latn/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Upozorenja"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Upozorenja"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Preporučene radnje koje mogu da sačuvaju živote ili imovinu"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Probna upozorenja"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Obaveštenja o testiranju"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Vežbe"</string>
 </resources>
diff --git a/res/values-mcc420-be/strings.xml b/res/values-mcc420-be/strings.xml
index 3ed230f..15ac655 100644
--- a/res/values-mcc420-be/strings.xml
+++ b/res/values-mcc420-be/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Тэставыя абвесткі"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Абвесткі для тэсціравання"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Практыкаванні"</string>
 </resources>
diff --git a/res/values-mcc420-bg/strings.xml b/res/values-mcc420-bg/strings.xml
index 8d0d3d3..3852984 100644
--- a/res/values-mcc420-bg/strings.xml
+++ b/res/values-mcc420-bg/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Тестови сигнали"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Сигнали за тестване"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Упражнения"</string>
 </resources>
diff --git a/res/values-mcc420-bn/strings.xml b/res/values-mcc420-bn/strings.xml
index 8c9a625..176a6b1 100644
--- a/res/values-mcc420-bn/strings.xml
+++ b/res/values-mcc420-bn/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"টেস্ট সতর্কতা"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"পরীক্ষা সম্পর্কিত সতর্কতা"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ব্যায়াম"</string>
 </resources>
diff --git a/res/values-mcc420-bs/strings.xml b/res/values-mcc420-bs/strings.xml
index 2af7ade..e2cd584 100644
--- a/res/values-mcc420-bs/strings.xml
+++ b/res/values-mcc420-bs/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Upozorenja"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Upozorenja"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Preporučene radnje kojim se mogu spasiti životi ili imovina"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Probna upozorenja"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testna upozorenja"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Vježbe"</string>
 </resources>
diff --git a/res/values-mcc420-ca/strings.xml b/res/values-mcc420-ca/strings.xml
index 40431a7..c1dcd96 100644
--- a/res/values-mcc420-ca/strings.xml
+++ b/res/values-mcc420-ca/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertes"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertes"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Accions recomanades que poden salvar vides o propietats"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alertes de prova"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alertes de prova"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercicis"</string>
 </resources>
diff --git a/res/values-mcc420-cs/strings.xml b/res/values-mcc420-cs/strings.xml
index f6a2ab1..71d5d53 100644
--- a/res/values-mcc420-cs/strings.xml
+++ b/res/values-mcc420-cs/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Upozornění"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Upozornění"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Doporučené akce, které mohou zachránit životy či majetek"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Test upozornění"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testovací upozornění"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Cvičení"</string>
 </resources>
diff --git a/res/values-mcc420-da/strings.xml b/res/values-mcc420-da/strings.xml
index fb2b136..e2a28d0 100644
--- a/res/values-mcc420-da/strings.xml
+++ b/res/values-mcc420-da/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Underretninger"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Underretninger"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Anbefalede handlinger, der kan redde liv eller ejendom"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testunderretninger"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testunderretninger"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Øvelser"</string>
 </resources>
diff --git a/res/values-mcc420-de/strings.xml b/res/values-mcc420-de/strings.xml
index 9c86458..ee99c23 100644
--- a/res/values-mcc420-de/strings.xml
+++ b/res/values-mcc420-de/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Benachrichtigungen"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Benachrichtigungen"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Empfohlene Maßnahmen, die Leben oder Eigentum retten können"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testbenachrichtigungen"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testbenachrichtigungen"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Übungen"</string>
 </resources>
diff --git a/res/values-mcc420-el/strings.xml b/res/values-mcc420-el/strings.xml
index fccb5e5..8680758 100644
--- a/res/values-mcc420-el/strings.xml
+++ b/res/values-mcc420-el/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Δοκιμαστικές ειδοποιήσεις"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Δοκιμαστικές ειδοποιήσεις"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Ασκήσεις"</string>
 </resources>
diff --git a/res/values-mcc420-en-rAU/strings.xml b/res/values-mcc420-en-rAU/strings.xml
index 7559166..d0391a3 100644
--- a/res/values-mcc420-en-rAU/strings.xml
+++ b/res/values-mcc420-en-rAU/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alerts"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Recommended actions that can save lives or property"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Test alerts"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testing alerts"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercises"</string>
 </resources>
diff --git a/res/values-mcc420-en-rCA/strings.xml b/res/values-mcc420-en-rCA/strings.xml
index 7559166..d0391a3 100644
--- a/res/values-mcc420-en-rCA/strings.xml
+++ b/res/values-mcc420-en-rCA/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alerts"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Recommended actions that can save lives or property"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Test alerts"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testing alerts"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercises"</string>
 </resources>
diff --git a/res/values-mcc420-en-rGB/strings.xml b/res/values-mcc420-en-rGB/strings.xml
index 7559166..d0391a3 100644
--- a/res/values-mcc420-en-rGB/strings.xml
+++ b/res/values-mcc420-en-rGB/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alerts"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Recommended actions that can save lives or property"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Test alerts"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testing alerts"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercises"</string>
 </resources>
diff --git a/res/values-mcc420-en-rIN/strings.xml b/res/values-mcc420-en-rIN/strings.xml
index 7559166..d0391a3 100644
--- a/res/values-mcc420-en-rIN/strings.xml
+++ b/res/values-mcc420-en-rIN/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alerts"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alerts"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Recommended actions that can save lives or property"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Test alerts"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testing alerts"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercises"</string>
 </resources>
diff --git a/res/values-mcc420-en-rXC/strings.xml b/res/values-mcc420-en-rXC/strings.xml
index b7188f8..38287b4 100644
--- a/res/values-mcc420-en-rXC/strings.xml
+++ b/res/values-mcc420-en-rXC/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎Alerts‎‏‎‎‏‎"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎Alerts‎‏‎‎‏‎"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎Recommended actions that can save lives or property‎‏‎‎‏‎"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎Test Alerts‎‏‎‎‏‎"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎Testing Alerts‎‏‎‎‏‎"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎Exercises‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-mcc420-es-rUS/strings.xml b/res/values-mcc420-es-rUS/strings.xml
index 49eefb4..f9b4398 100644
--- a/res/values-mcc420-es-rUS/strings.xml
+++ b/res/values-mcc420-es-rUS/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertas"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertas"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Acciones recomendadas que pueden salvar vidas o cosas"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alertas de prueba"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Prueba de alertas"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Ejercicios"</string>
 </resources>
diff --git a/res/values-mcc420-es/strings.xml b/res/values-mcc420-es/strings.xml
index 4e5e2a0..f5beb32 100644
--- a/res/values-mcc420-es/strings.xml
+++ b/res/values-mcc420-es/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertas"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertas"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Acciones recomendadas que pueden salvar vidas o propiedades"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alertas de prueba"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alertas de prueba"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Simulacros"</string>
 </resources>
diff --git a/res/values-mcc420-et/strings.xml b/res/values-mcc420-et/strings.xml
index 33d8495..a6b7e43 100644
--- a/res/values-mcc420-et/strings.xml
+++ b/res/values-mcc420-et/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Hoiatused"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Hoiatused"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Soovitatud toimingud, mis võivad päästa elusid või vara"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testhoiatused"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Hoiatuste testimine"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Harjutused"</string>
 </resources>
diff --git a/res/values-mcc420-eu/strings.xml b/res/values-mcc420-eu/strings.xml
index 3d11950..00cd727 100644
--- a/res/values-mcc420-eu/strings.xml
+++ b/res/values-mcc420-eu/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertak"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertak"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Bizia edo ondasunak salbatzeko ekintza gomendatuak"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testu-mezu bidezko alertak"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Probak egiteko alertak"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Ariketak"</string>
 </resources>
diff --git a/res/values-mcc420-fa/strings.xml b/res/values-mcc420-fa/strings.xml
index ea1bc97..ab633ce 100644
--- a/res/values-mcc420-fa/strings.xml
+++ b/res/values-mcc420-fa/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"هشدارهای آزمایشی"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"هشدارهای آزمایشی"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"تمرین"</string>
 </resources>
diff --git a/res/values-mcc420-fi/strings.xml b/res/values-mcc420-fi/strings.xml
index d031b06..84b10b5 100644
--- a/res/values-mcc420-fi/strings.xml
+++ b/res/values-mcc420-fi/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Varoitukset"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Varoitukset"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Toimintasuositukset, joilla voidaan suojata ihmishenkiä tai omaisuutta"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testivaroitukset"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testausilmoitukset"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Harjoitukset"</string>
 </resources>
diff --git a/res/values-mcc420-fr-rCA/strings.xml b/res/values-mcc420-fr-rCA/strings.xml
index 13f1808..2ef09e0 100644
--- a/res/values-mcc420-fr-rCA/strings.xml
+++ b/res/values-mcc420-fr-rCA/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertes"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertes"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Recommandations pouvant sauver des vies ou des biens"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alertes test"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alertes tests"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercices"</string>
 </resources>
diff --git a/res/values-mcc420-fr/strings.xml b/res/values-mcc420-fr/strings.xml
index f76da32..907263b 100644
--- a/res/values-mcc420-fr/strings.xml
+++ b/res/values-mcc420-fr/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertes"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertes"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Actions recommandées susceptibles de sauver des vies ou des biens"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alertes de test"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alertes de test"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercices"</string>
 </resources>
diff --git a/res/values-mcc420-gl/strings.xml b/res/values-mcc420-gl/strings.xml
index 85abcd0..509111f 100644
--- a/res/values-mcc420-gl/strings.xml
+++ b/res/values-mcc420-gl/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertas"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertas"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Accións recomendadas que poden salvar vidas ou propiedades"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alertas de proba"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alertas de proba"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercicios"</string>
 </resources>
diff --git a/res/values-mcc420-gu/strings.xml b/res/values-mcc420-gu/strings.xml
index 447792d..f267cba 100644
--- a/res/values-mcc420-gu/strings.xml
+++ b/res/values-mcc420-gu/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"પરીક્ષણના અલર્ટ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"પરીક્ષણ અલર્ટ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"કસરત"</string>
 </resources>
diff --git a/res/values-mcc420-hi/strings.xml b/res/values-mcc420-hi/strings.xml
index dfe4800..75e5b2b 100644
--- a/res/values-mcc420-hi/strings.xml
+++ b/res/values-mcc420-hi/strings.xml
@@ -20,9 +20,9 @@
     <!-- 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="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="197559096432885563">"जांच करने के लिए भेजी जाने वाली सूचनाएं"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"जांच के लिए दी जाने वाली सूचनाएं"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"अभ्यास"</string>
 </resources>
diff --git a/res/values-mcc420-hr/strings.xml b/res/values-mcc420-hr/strings.xml
index 7e507a8..ace11a7 100644
--- a/res/values-mcc420-hr/strings.xml
+++ b/res/values-mcc420-hr/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Upozorenja"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Upozorenja"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Preporučene radnje koje mogu spasiti živote ili imovinu"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testiranje upozorenja"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testna upozorenja"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Vježbe"</string>
 </resources>
diff --git a/res/values-mcc420-hu/strings.xml b/res/values-mcc420-hu/strings.xml
index 08e07d0..7409bb2 100644
--- a/res/values-mcc420-hu/strings.xml
+++ b/res/values-mcc420-hu/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Riasztások"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Riasztások"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Élet és anyagi eszközök mentésére szolgáló javasolt intézkedések"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Próbariasztások"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Próbariasztások"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Gyakorlatok"</string>
 </resources>
diff --git a/res/values-mcc420-hy/strings.xml b/res/values-mcc420-hy/strings.xml
index f663369..cedd154 100644
--- a/res/values-mcc420-hy/strings.xml
+++ b/res/values-mcc420-hy/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Փորձնական ծանուցումներ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Փորձնական ազդանշաններ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Վարժանքներ"</string>
 </resources>
diff --git a/res/values-mcc420-in/strings.xml b/res/values-mcc420-in/strings.xml
index bbe6456..4f4f2c1 100644
--- a/res/values-mcc420-in/strings.xml
+++ b/res/values-mcc420-in/strings.xml
@@ -20,9 +20,9 @@
     <!-- no translation found for cmas_extreme_immediate_likely_alert (5872678423468023949) -->
     <skip />
     <string name="cmas_severe_alert" msgid="1611418922477376647">"Notifikasi Peringatan Darurat"</string>
-    <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Notifikasi"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Notifikasi"</string>
+    <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Peringatan"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Peringatan"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Tindakan yang disarankan untuk menyelamatkan nyawa atau harta benda"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Uji Notifikasi"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Notifikasi Pengujian"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Latihan"</string>
 </resources>
diff --git a/res/values-mcc420-is/strings.xml b/res/values-mcc420-is/strings.xml
index 7ebcac1..942f205 100644
--- a/res/values-mcc420-is/strings.xml
+++ b/res/values-mcc420-is/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Tilkynningar"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Tilkynningar"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Ráðlagðar aðgerðir sem geta bjargað mannslífum og verndað eignir"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Prófa tilkynningar"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Prófunartilkynning"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Æfingar"</string>
 </resources>
diff --git a/res/values-mcc420-it/strings.xml b/res/values-mcc420-it/strings.xml
index 4dcc28d..f15ac0c 100644
--- a/res/values-mcc420-it/strings.xml
+++ b/res/values-mcc420-it/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Allarmi"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Allarmi"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Comportamenti consigliati che possono salvare vite umane o proprietà"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Allarmi di prova"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Avvisi di prova"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Esercitazioni"</string>
 </resources>
diff --git a/res/values-mcc420-iw/strings.xml b/res/values-mcc420-iw/strings.xml
index f66e5c1..255c24c 100644
--- a/res/values-mcc420-iw/strings.xml
+++ b/res/values-mcc420-iw/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"בדיקת התראות"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"התראות לבדיקה"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"תרגילים"</string>
 </resources>
diff --git a/res/values-mcc420-ja/strings.xml b/res/values-mcc420-ja/strings.xml
index 0db0075..907591b 100644
--- a/res/values-mcc420-ja/strings.xml
+++ b/res/values-mcc420-ja/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"テストアラート"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"テストアラート"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"訓練"</string>
 </resources>
diff --git a/res/values-mcc420-ka/strings.xml b/res/values-mcc420-ka/strings.xml
index aaad5c1..da4dde7 100644
--- a/res/values-mcc420-ka/strings.xml
+++ b/res/values-mcc420-ka/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"სატესტო გაფრთხილებები"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"ტესტირების გაფრთხილებები"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ვარჯიშები"</string>
 </resources>
diff --git a/res/values-mcc420-kk/strings.xml b/res/values-mcc420-kk/strings.xml
index 0dee262..aec6c4f 100644
--- a/res/values-mcc420-kk/strings.xml
+++ b/res/values-mcc420-kk/strings.xml
@@ -20,9 +20,9 @@
     <!-- 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="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="197559096432885563">"Сынақ ескертулері"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Сынақ туралы хабарландырулар"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Жаттығулар"</string>
 </resources>
diff --git a/res/values-mcc420-km/strings.xml b/res/values-mcc420-km/strings.xml
index 801cf0a..bbadbbd 100644
--- a/res/values-mcc420-km/strings.xml
+++ b/res/values-mcc420-km/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"ការជូនដំណឹង​សាកល្បង"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"ការជូនដំណឹង​អំពីការធ្វើតេស្ត"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"សកម្មភាព"</string>
 </resources>
diff --git a/res/values-mcc420-kn/strings.xml b/res/values-mcc420-kn/strings.xml
index f8eefdf..f5cb16b 100644
--- a/res/values-mcc420-kn/strings.xml
+++ b/res/values-mcc420-kn/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"ಪರೀಕ್ಷೆ ಅಲರ್ಟ್‌ಗಳು"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"ಟೆಸ್ಟ್ ಅಲರ್ಟ್‌ಗಳು"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ವ್ಯಾಯಾಮಗಳು"</string>
 </resources>
diff --git a/res/values-mcc420-ko/strings.xml b/res/values-mcc420-ko/strings.xml
index b96f3a2..efac489 100644
--- a/res/values-mcc420-ko/strings.xml
+++ b/res/values-mcc420-ko/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"테스트 알림"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"테스트 알림"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"운동"</string>
 </resources>
diff --git a/res/values-mcc420-ky/strings.xml b/res/values-mcc420-ky/strings.xml
index 3aac260..4837773 100644
--- a/res/values-mcc420-ky/strings.xml
+++ b/res/values-mcc420-ky/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Сынамык эскертүүлөр"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Сынамык эскертүүлөр"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Көнүгүүлөр"</string>
 </resources>
diff --git a/res/values-mcc420-lo/strings.xml b/res/values-mcc420-lo/strings.xml
index b2e662d..0a1f4be 100644
--- a/res/values-mcc420-lo/strings.xml
+++ b/res/values-mcc420-lo/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"ທົດສອບການເຕືອນ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"ການທົດສອບການແຈ້ງເຕືອນ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ການເຝິກແອບ"</string>
 </resources>
diff --git a/res/values-mcc420-lt/strings.xml b/res/values-mcc420-lt/strings.xml
index a540a72..b8398ab 100644
--- a/res/values-mcc420-lt/strings.xml
+++ b/res/values-mcc420-lt/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Įspėjimai"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Įspėjimai"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Rekomenduojami veiksmai, kuriais galima apsaugoti gyvybę ar nuosavybę"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Bandomieji įspėjimai"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Bandomieji įspėjimai"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Pratimai"</string>
 </resources>
diff --git a/res/values-mcc420-lv/strings.xml b/res/values-mcc420-lv/strings.xml
index b1c64e8..991a7da 100644
--- a/res/values-mcc420-lv/strings.xml
+++ b/res/values-mcc420-lv/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Brīdinājumi"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Brīdinājumi"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Ieteicamā rīcība, kas var izglābt dzīvību vai īpašumu"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testa brīdinājumi"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testēšanas brīdinājumi"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Mācību trauksmes"</string>
 </resources>
diff --git a/res/values-mcc420-mk/strings.xml b/res/values-mcc420-mk/strings.xml
index 74db54f..54d5a35 100644
--- a/res/values-mcc420-mk/strings.xml
+++ b/res/values-mcc420-mk/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Тест предупредувања"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Тест-предупредувања"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Вежби"</string>
 </resources>
diff --git a/res/values-mcc420-ml/strings.xml b/res/values-mcc420-ml/strings.xml
index b9c3184..ce8b219 100644
--- a/res/values-mcc420-ml/strings.xml
+++ b/res/values-mcc420-ml/strings.xml
@@ -22,7 +22,7 @@
     <string name="cmas_severe_alert" msgid="1611418922477376647">"അടിയന്തര മുന്നറിയിപ്പുകൾ"</string>
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"മുന്നറിയിപ്പുകൾ"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"മുന്നറിയിപ്പുകൾ"</string>
-    <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"ജീവിതമോ സ്വത്തോ സംരക്ഷിക്കാനുതകുന്ന, ശുപാർശ ചെയ്‌തിരിക്കുന്ന നടപടികൾ"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"പരിശോധനാ മുന്നറിയിപ്പുകൾ"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"ജീവനോ സ്വത്തോ സംരക്ഷിക്കാൻ ശുപാർശ ചെയ്‌തിരിക്കുന്ന പ്രവൃത്തികൾ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"പരീക്ഷണ മുന്നറിയിപ്പുകൾ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"വ്യായാമങ്ങൾ"</string>
 </resources>
diff --git a/res/values-mcc420-mn/strings.xml b/res/values-mcc420-mn/strings.xml
index 4404088..a44fc53 100644
--- a/res/values-mcc420-mn/strings.xml
+++ b/res/values-mcc420-mn/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Туршилтын сэрэмжлүүлэг"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Туршилтын сэрэмжлүүлэг"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Сургуулилалт"</string>
 </resources>
diff --git a/res/values-mcc420-mr/strings.xml b/res/values-mcc420-mr/strings.xml
index 2249c27..c84d593 100644
--- a/res/values-mcc420-mr/strings.xml
+++ b/res/values-mcc420-mr/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"चाचणीच्या सूचना"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"चाचणी करण्याच्या सूचना"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"व्यायाम"</string>
 </resources>
diff --git a/res/values-mcc420-ms/strings.xml b/res/values-mcc420-ms/strings.xml
index f0663a6..4bfd296 100644
--- a/res/values-mcc420-ms/strings.xml
+++ b/res/values-mcc420-ms/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Makluman"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Makluman"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Tindakan yang disyorkan untuk menyelamatkan nyawa atau harta"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Makluman Ujian"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Menguji Makluman"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Senaman"</string>
 </resources>
diff --git a/res/values-mcc420-my/strings.xml b/res/values-mcc420-my/strings.xml
index 389e3e0..5ec05b2 100644
--- a/res/values-mcc420-my/strings.xml
+++ b/res/values-mcc420-my/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"စမ်းသပ် သတိပေးချက်များ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"စမ်းသပ်မှု သတိပေးချက်များ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"လေ့ကျင့်ခန်းများ"</string>
 </resources>
diff --git a/res/values-mcc420-nb/strings.xml b/res/values-mcc420-nb/strings.xml
index cf44ef5..baf1ac5 100644
--- a/res/values-mcc420-nb/strings.xml
+++ b/res/values-mcc420-nb/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Varsler"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Varsler"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Anbefalte handlinger som kan redde liv eller eiendom"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testvarsler"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testvarsler"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Øvelser"</string>
 </resources>
diff --git a/res/values-mcc420-ne/strings.xml b/res/values-mcc420-ne/strings.xml
index 3ea74a1..53ddd2c 100644
--- a/res/values-mcc420-ne/strings.xml
+++ b/res/values-mcc420-ne/strings.xml
@@ -14,15 +14,15 @@
 <resources xmlns:android="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_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="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="197559096432885563">"जाँचसम्बन्धी सतर्कताहरू"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"परीक्षणसम्बन्धी अलर्टहरू"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"कसरतहरू"</string>
 </resources>
diff --git a/res/values-mcc420-nl/strings.xml b/res/values-mcc420-nl/strings.xml
index ea9eb79..bd4aeec 100644
--- a/res/values-mcc420-nl/strings.xml
+++ b/res/values-mcc420-nl/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Meldingen"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Meldingen"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Aanbevolen acties die levens of eigendommen kunnen redden"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testmeldingen"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testmeldingen"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Oefeningen"</string>
 </resources>
diff --git a/res/values-mcc420-or/strings.xml b/res/values-mcc420-or/strings.xml
index d11af9e..36b8235 100644
--- a/res/values-mcc420-or/strings.xml
+++ b/res/values-mcc420-or/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"ଟେଷ୍ଟିଂ ଆଲର୍ଟ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ବ୍ୟାୟାମ"</string>
 </resources>
diff --git a/res/values-mcc420-pa/strings.xml b/res/values-mcc420-pa/strings.xml
index 39b8278..622b97d 100644
--- a/res/values-mcc420-pa/strings.xml
+++ b/res/values-mcc420-pa/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"ਜਾਂਚ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"ਜਾਂਚ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ਕਸਰਤਾਂ"</string>
 </resources>
diff --git a/res/values-mcc420-pl/strings.xml b/res/values-mcc420-pl/strings.xml
index 6d8810b..2f3b0da 100644
--- a/res/values-mcc420-pl/strings.xml
+++ b/res/values-mcc420-pl/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alerty"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alerty"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Zalecane działania pomagające ocalić życie lub mienie"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alerty testowe"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alerty testowe"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Ćwiczenia"</string>
 </resources>
diff --git a/res/values-mcc420-pt-rPT/strings.xml b/res/values-mcc420-pt-rPT/strings.xml
index e779117..06a70fd 100644
--- a/res/values-mcc420-pt-rPT/strings.xml
+++ b/res/values-mcc420-pt-rPT/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertas"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertas"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Ações recomendadas que podem salvar vidas ou propriedades."</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alertas de testes"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alertas de testes"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercícios"</string>
 </resources>
diff --git a/res/values-mcc420-pt/strings.xml b/res/values-mcc420-pt/strings.xml
index 84d0e33..825e70c 100644
--- a/res/values-mcc420-pt/strings.xml
+++ b/res/values-mcc420-pt/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alertas"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alertas"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Ações recomendadas que podem salvar vidas ou propriedades"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alertas de teste"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alertas de teste"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exercícios"</string>
 </resources>
diff --git a/res/values-mcc420-ro/strings.xml b/res/values-mcc420-ro/strings.xml
index 569d3b9..5d7ef23 100644
--- a/res/values-mcc420-ro/strings.xml
+++ b/res/values-mcc420-ro/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Alerte"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Alerte"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Acțiuni recomandate care pot salva vieți sau bunuri"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Alerte de testare"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Alerte de testare"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Exerciții"</string>
 </resources>
diff --git a/res/values-mcc420-ru/strings.xml b/res/values-mcc420-ru/strings.xml
index 58c587a..f3a252f 100644
--- a/res/values-mcc420-ru/strings.xml
+++ b/res/values-mcc420-ru/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Тестовые оповещения"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Тестовые оповещения"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Учебные тревоги"</string>
 </resources>
diff --git a/res/values-mcc420-si/strings.xml b/res/values-mcc420-si/strings.xml
index 715e355..8d8f883 100644
--- a/res/values-mcc420-si/strings.xml
+++ b/res/values-mcc420-si/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"පරීක්ෂණ ඇඟවීම්"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"පරීක්ෂා කිරීමේ ඇඟවීම්"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ව්‍යායාම"</string>
 </resources>
diff --git a/res/values-mcc420-sk/strings.xml b/res/values-mcc420-sk/strings.xml
index 22272c9..edce27b 100644
--- a/res/values-mcc420-sk/strings.xml
+++ b/res/values-mcc420-sk/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Upozornenia"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Upozornenia"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Odporúčané akcie, ktoré môžu zachrániť životy alebo majetok"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testovacie upozornenia"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testovacie upozornenia"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Cvičenia"</string>
 </resources>
diff --git a/res/values-mcc420-sl/strings.xml b/res/values-mcc420-sl/strings.xml
index 701d27f..5f35486 100644
--- a/res/values-mcc420-sl/strings.xml
+++ b/res/values-mcc420-sl/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Opozorila"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Opozorila"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Priporočena dejanja, ki lahko rešijo življenja ali premoženje"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Preizkusna opozorila"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Preizkusna opozorila"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Vaje"</string>
 </resources>
diff --git a/res/values-mcc420-sq/strings.xml b/res/values-mcc420-sq/strings.xml
index f1c34a7..277a66a 100644
--- a/res/values-mcc420-sq/strings.xml
+++ b/res/values-mcc420-sq/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Sinjalizime"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Sinjalizime"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Veprime të rekomanduara që mund të shpëtojnë jetën ose pronën"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Sinjalizime testimi"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Sinjalizimet e testimit"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Ushtrime"</string>
 </resources>
diff --git a/res/values-mcc420-sr/strings.xml b/res/values-mcc420-sr/strings.xml
index 9c8d5d4..e7bf34b 100644
--- a/res/values-mcc420-sr/strings.xml
+++ b/res/values-mcc420-sr/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Пробна упозорења"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Обавештења о тестирању"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Вежбе"</string>
 </resources>
diff --git a/res/values-mcc420-sv/strings.xml b/res/values-mcc420-sv/strings.xml
index 133e00e..485dc46 100644
--- a/res/values-mcc420-sv/strings.xml
+++ b/res/values-mcc420-sv/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Varningar"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Varningar"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Rekommenderade åtgärder som kan rädda liv eller egendom"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Testvarningar"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Testvarningar"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Övningar"</string>
 </resources>
diff --git a/res/values-mcc420-sw/strings.xml b/res/values-mcc420-sw/strings.xml
index 72a6bf8..e369f78 100644
--- a/res/values-mcc420-sw/strings.xml
+++ b/res/values-mcc420-sw/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Arifa"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Arifa"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Hatua zinazopendekezwa ambazo zinaweza kuokoa maisha au mali"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Arifa za Majaribio"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Arifa za Majaribio"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Mazoezi"</string>
 </resources>
diff --git a/res/values-mcc420-ta/strings.xml b/res/values-mcc420-ta/strings.xml
index b4c3237..8d753fd 100644
--- a/res/values-mcc420-ta/strings.xml
+++ b/res/values-mcc420-ta/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"பரிசோதனை விழிப்பூட்டல்கள்"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"சோதனை விழிப்பூட்டல்கள்"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"உடற்பயிற்சிகள்"</string>
 </resources>
diff --git a/res/values-mcc420-te/strings.xml b/res/values-mcc420-te/strings.xml
index f4441d0..311c435 100644
--- a/res/values-mcc420-te/strings.xml
+++ b/res/values-mcc420-te/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"పరీక్ష అలర్ట్‌లు"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"టెస్టింగ్ అలర్ట్‌లు"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"వ్యాయామాలు"</string>
 </resources>
diff --git a/res/values-mcc420-th/strings.xml b/res/values-mcc420-th/strings.xml
index 381b8af..a5264fc 100644
--- a/res/values-mcc420-th/strings.xml
+++ b/res/values-mcc420-th/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"การแจ้งเตือนทดสอบ"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"การแจ้งเตือนการทดสอบ"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"การออกกำลังกาย"</string>
 </resources>
diff --git a/res/values-mcc420-tl/strings.xml b/res/values-mcc420-tl/strings.xml
index 0923ced..aa6fa39 100644
--- a/res/values-mcc420-tl/strings.xml
+++ b/res/values-mcc420-tl/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Mga Alerto"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Mga Alerto"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Mga inirerekomendang pagkilos na makakaligtas ng mga buhay o pag-aari"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Mga Pansubok na Alerto"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Mga Alerto sa Pagsubok"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Mga Ehersisyo"</string>
 </resources>
diff --git a/res/values-mcc420-tr/strings.xml b/res/values-mcc420-tr/strings.xml
index 0159528..5e5c544 100644
--- a/res/values-mcc420-tr/strings.xml
+++ b/res/values-mcc420-tr/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Uyarılar"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Uyarılar"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Can ve mal kaybını önleyebilecek işlem önerileri"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Test Amaçlı Uyarılar"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Test Uyarıları"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Egzersizler"</string>
 </resources>
diff --git a/res/values-mcc420-uk/strings.xml b/res/values-mcc420-uk/strings.xml
index bfd089c..090dbe8 100644
--- a/res/values-mcc420-uk/strings.xml
+++ b/res/values-mcc420-uk/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"Тестові сповіщення"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Тестові сповіщення"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Тренувальні"</string>
 </resources>
diff --git a/res/values-mcc420-ur/strings.xml b/res/values-mcc420-ur/strings.xml
index 7b3d097..8e25e6e 100644
--- a/res/values-mcc420-ur/strings.xml
+++ b/res/values-mcc420-ur/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"ٹیسٹ الرٹس"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"ٹیسٹنگ الرٹس"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"ورزشیں"</string>
 </resources>
diff --git a/res/values-mcc420-uz/strings.xml b/res/values-mcc420-uz/strings.xml
index 570d5b1..4440244 100644
--- a/res/values-mcc420-uz/strings.xml
+++ b/res/values-mcc420-uz/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Bildirishnomalar"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Bildirishnomalar"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Inson hayoti yoki mulkini asrashga oid tavsiya etiladigan amallar"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Test bildirishnomalari"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Ogohlantiruvlarni sinash"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Mashgʻulotlar"</string>
 </resources>
diff --git a/res/values-mcc420-vi/strings.xml b/res/values-mcc420-vi/strings.xml
index b991e99..dc85d1e 100644
--- a/res/values-mcc420-vi/strings.xml
+++ b/res/values-mcc420-vi/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Cảnh báo"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Cảnh báo"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Hành động được đề xuất có thể bảo vệ tính mạng hoặc tài sản"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Cảnh báo thử nghiệm"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Cảnh báo thử nghiệm"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Bài tập"</string>
 </resources>
diff --git a/res/values-mcc420-zh-rCN/strings.xml b/res/values-mcc420-zh-rCN/strings.xml
index b436a67..108722e 100644
--- a/res/values-mcc420-zh-rCN/strings.xml
+++ b/res/values-mcc420-zh-rCN/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"测试警报"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"测试警报"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"演习"</string>
 </resources>
diff --git a/res/values-mcc420-zh-rHK/strings.xml b/res/values-mcc420-zh-rHK/strings.xml
index 9a81da0..1f09743 100644
--- a/res/values-mcc420-zh-rHK/strings.xml
+++ b/res/values-mcc420-zh-rHK/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="5922755396541728069">"全國警報通知"</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 />
@@ -23,6 +23,6 @@
     <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="197559096432885563">"測試通知"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"測試警示"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"運動"</string>
 </resources>
diff --git a/res/values-mcc420-zh-rTW/strings.xml b/res/values-mcc420-zh-rTW/strings.xml
index a78734e..8496839 100644
--- a/res/values-mcc420-zh-rTW/strings.xml
+++ b/res/values-mcc420-zh-rTW/strings.xml
@@ -23,6 +23,6 @@
     <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="197559096432885563">"測試快訊"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"測試警示"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"演習"</string>
 </resources>
diff --git a/res/values-mcc420-zu/strings.xml b/res/values-mcc420-zu/strings.xml
index 9a79b12..2c350f3 100644
--- a/res/values-mcc420-zu/strings.xml
+++ b/res/values-mcc420-zu/strings.xml
@@ -23,6 +23,6 @@
     <string name="pws_other_message_identifiers" msgid="7907712751421890873">"Izexwayiso"</string>
     <string name="enable_emergency_alerts_message_title" msgid="5267857032926801433">"Izexwayiso"</string>
     <string name="enable_emergency_alerts_message_summary" msgid="8961532453478455676">"Izenzo ezikhethekile ezingalondoloza izimpilo noma indawo"</string>
-    <string name="cmas_required_monthly_test" msgid="197559096432885563">"Izexwayiso zohlolo"</string>
+    <string name="cmas_required_monthly_test" msgid="5733131786754331921">"Izexwayiso Zokuhlola"</string>
     <string name="cmas_exercise_alert" msgid="7249058541625071454">"Ukujima"</string>
 </resources>
diff --git a/res/values-mcc420/config.xml b/res/values-mcc420/config.xml
index 7acbfba..7639507 100644
--- a/res/values-mcc420/config.xml
+++ b/res/values-mcc420/config.xml
@@ -23,17 +23,53 @@
     <bool name="show_amber_alert_settings">false</bool>
 
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">true</bool>
+    <bool name="override_dnd">true</bool>
+    <!-- 4370, 4383 -->
+    <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
+        <item>0x1112:rat=gsm, emergency=true, always_on=true, language=ar</item>
+        <!-- additional language -->
+        <item>0x111F:rat=gsm, emergency=true, always_on=true, language=en</item>
+    </string-array>
     <!-- Channels to receive emergency alerts -->
+    <!-- 4371~4372, 4384~4385 -->
+    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
+        <item>0x1113-0x1114:rat=gsm, emergency=true, always_on=true, language=ar</item>
+        <!-- additional language -->
+        <item>0x1120-0x1121:rat=gsm, emergency=true, always_on=true, language=en</item>
+    </string-array>
+    <!-- 4373~4378, 4386~4391 -->
+    <string-array name="cmas_alerts_severe_range_strings" translatable="false">
+        <item>0x1115-0x111A:rat=gsm, emergency=true, always_on=true, language=ar</item>
+        <!-- additional language -->
+        <item>0x1122-0x1127:rat=gsm, emergency=true, always_on=true, language=en</item>
+    </string-array>
     <!-- 4379, 4392 -->
     <string-array name="emergency_alerts_channels_range_strings" translatable="false">
-        <item>0x111B:rat=gsm, emergency=true</item>
+        <item>0x111B:rat=gsm, emergency=true, language=ar</item>
         <!-- additional language -->
-        <item>0x1128:rat=gsm, emergency=true</item>
+        <item>0x1128:rat=gsm, emergency=true, language=en</item>
     </string-array>
-    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
+    <!-- 4380, 4393 -->
+    <string-array name="required_monthly_test_range_strings" translatable="false">
+        <item>0x111C:rat=gsm, emergency=true, language=ar</item>
+        <!-- additional language -->
+        <item>0x1129:rat=gsm, emergency=true, language=en</item>
     </string-array>
     <!-- Whether to always receive exercise alerts regardless of test alerts toggle state -->
     <!-- By default it's true for Saudi users -->
-    <bool name="always_enable_exercise_alert">true</bool>
+    <!-- 4381, 4394 -->
+    <string-array name="exercise_alert_range_strings" translatable="false">
+        <item>0x111D:rat=gsm, emergency=true, always_on=true, language=ar</item>
+        <!-- additional language -->
+        <item>0x112A:rat=gsm, emergency=true, always_on=true, language=en</item>
+    </string-array>
+    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
+    </string-array>
+
+    <!-- Whether to override the language of the alert dialog's title to match the message locale -->
+    <bool name="override_alert_title_language_to_match_message_locale">true</bool>
+    <!-- Whether enabling copy message text into clipboard by long press -->
+    <bool name="enable_text_copy">false</bool>
+    <!-- Text links generating method. does not allow text to be copied. so we can't use smart linkify. -->
+    <string name="link_method" translatable="false">legacy_linkify</string>
 </resources>
diff --git a/res/values-mcc420/strings.xml b/res/values-mcc420/strings.xml
index ef1e415..26ea9ba 100644
--- a/res/values-mcc420/strings.xml
+++ b/res/values-mcc420/strings.xml
@@ -27,7 +27,7 @@
     <string name="enable_emergency_alerts_message_title">Alerts</string>
     <string name="enable_emergency_alerts_message_summary">Recommended actions that can save lives or property</string>
     <!-- Dialog title for test alert. [CHAR LIMIT=50] -->
-    <string name="cmas_required_monthly_test">Test Alerts</string>
+    <string name="cmas_required_monthly_test">Testing Alerts</string>
     <!-- Dialog title for exercise level alert. [CHAR LIMIT=50] -->
     <string name="cmas_exercise_alert">Exercises</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-mcc422-ca/strings.xml b/res/values-mcc422-ca/strings.xml
index 638ccb8..ac37b7f 100644
--- a/res/values-mcc422-ca/strings.xml
+++ b/res/values-mcc422-ca/strings.xml
@@ -15,5 +15,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="3211812107922643307">"Alerta d\'emergències"</string>
     <string name="pws_other_message_identifiers" msgid="7325727748670134223">"Alerta d\'advertiment"</string>
-    <string name="cmas_exercise_alert" msgid="8865117243431902282">"Alerta de prova"</string>
+    <string name="cmas_exercise_alert" msgid="8865117243431902282">"Simulacre d\'alerta"</string>
 </resources>
diff --git a/res/values-mcc422-cs/strings.xml b/res/values-mcc422-cs/strings.xml
index 1b9aab6..e005378 100644
--- a/res/values-mcc422-cs/strings.xml
+++ b/res/values-mcc422-cs/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">"Nouzová výstraha"</string>
+    <string name="cmas_presidential_level_alert" msgid="3211812107922643307">"Výstražná zpráva"</string>
     <string name="pws_other_message_identifiers" msgid="7325727748670134223">"Upozornění"</string>
     <string name="cmas_exercise_alert" msgid="8865117243431902282">"Cvičné upozornění"</string>
 </resources>
diff --git a/res/values-mcc422-fi/strings.xml b/res/values-mcc422-fi/strings.xml
index 8bd2fb7..b02ac2a 100644
--- a/res/values-mcc422-fi/strings.xml
+++ b/res/values-mcc422-fi/strings.xml
@@ -13,7 +13,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="3211812107922643307">"Hätätilannehälytys"</string>
+    <string name="cmas_presidential_level_alert" msgid="3211812107922643307">"Vaaratiedote"</string>
     <string name="pws_other_message_identifiers" msgid="7325727748670134223">"Varoitus"</string>
     <string name="cmas_exercise_alert" msgid="8865117243431902282">"Harjoitushälytys"</string>
 </resources>
diff --git a/res/values-mcc422-iw/strings.xml b/res/values-mcc422-iw/strings.xml
index 1dd7f6b..bcd59e8 100644
--- a/res/values-mcc422-iw/strings.xml
+++ b/res/values-mcc422-iw/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">"התרעה על מקרה חירום"</string>
+    <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>
 </resources>
diff --git a/res/values-mcc422-ne/strings.xml b/res/values-mcc422-ne/strings.xml
index 7728f44..de49897 100644
--- a/res/values-mcc422-ne/strings.xml
+++ b/res/values-mcc422-ne/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">"आपत्कालीन सतर्कता"</string>
+    <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>
 </resources>
diff --git a/res/values-mcc422/config.xml b/res/values-mcc422/config.xml
index b5ca13b..3329da8 100644
--- a/res/values-mcc422/config.xml
+++ b/res/values-mcc422/config.xml
@@ -18,7 +18,7 @@
     <!-- 4370 emergency alert can not be disabled -->
     <!-- Oman requires to play alert for 30s -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, alert_duration=30000</item>
+        <item>0x1112:rat=gsm, emergency=true, alert_duration=30000, always_on=true</item>
     </string-array>
     <!-- 4371 warning alert cannot be disabled-->
     <string-array name="additional_cbs_channels_strings" translatable="false">
@@ -29,7 +29,7 @@
         <item>0x111D:rat=gsm, emergency=true</item>
     </string-array>
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">true</bool>
+    <bool name="override_dnd">true</bool>
     <!-- test alerts toggle default true for Oman users -->
     <bool name="test_alerts_enabled_default">true</bool>
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
diff --git a/res/values-mcc424-af/strings.xml b/res/values-mcc424-af/strings.xml
index c15ae87..c380646 100644
--- a/res/values-mcc424-af/strings.xml
+++ b/res/values-mcc424-af/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nasionale noodberig"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Waarskuwings"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Waarskuwings"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Toetswaarskuwing"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Toetswaarskuwing"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nasionale noodberig"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Noodberig"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Noodberig"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Noodberig"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Noodberig"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Waarskuwing"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Publiekeveiligheidwaarskuwing"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Oefen"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Toetswaarskuwing"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Toetswaarskuwing"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Waarskuwings"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Publiekeveiligheidwaarskuwings"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Toetswaarskuwings"</string>
 </resources>
diff --git a/res/values-mcc424-am/strings.xml b/res/values-mcc424-am/strings.xml
index b57b7ee..d1fde6a 100644
--- a/res/values-mcc424-am/strings.xml
+++ b/res/values-mcc424-am/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ብሔራዊ የአደጋ ጊዜ ማንቂያ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"ማስጠንቀቂያ ማንቂያዎች"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ማስጠንቀቂያ ማንቂያዎች"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ማንቂያን ፈትሽ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"ማንቂያን ሞክር"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ብሔራዊ የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"የአደጋ ጊዜ ማንቂያ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"የማስጠንቀቂያ ማንቂያ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"የሕዝባዊ ደህንነት ማንቂያ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ልምምድ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ማንቂያን ሞክር"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ማንቂያን ሞክር"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ማስጠንቀቂያ ማንቂያዎች"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"የሕዝባዊ ደህንነት ማንቂያዎች"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"የሙከራ ማንቂያዎች"</string>
 </resources>
diff --git a/res/values-mcc424-ar/strings.xml b/res/values-mcc424-ar/strings.xml
index 6bbe3e6..b165605 100644
--- a/res/values-mcc424-ar/strings.xml
+++ b/res/values-mcc424-ar/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"تحذير طارئ وطني"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"رسائل تحذيرية"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"التنبيهات التحذيرية"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"رسالة تجريبية"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"تنبيه تجريبي"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"تحذير طارئ وطني"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"تحذير طارئ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"تحذير طارئ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"تحذير طارئ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"تحذير طارئ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"رسالة تحذيرية"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"تحذير: السلامة العامة"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"تمرين"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"رسالة تجريبية"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"رسالة تجريبية"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"رسالة تحذيرية"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"تحذير: السلامة العامة"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"رسالة تجريبية"</string>
 </resources>
diff --git a/res/values-mcc424-as/strings.xml b/res/values-mcc424-as/strings.xml
index 084c515..e07c623 100644
--- a/res/values-mcc424-as/strings.xml
+++ b/res/values-mcc424-as/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ৰাষ্ট্ৰীয় জৰুৰীকালীন সতর্কতা"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"সকীয়নিমূলক সতৰ্কবাৰ্তাসমূহ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"সকীয়নিমূলক সতৰ্কবাৰ্তাসমূহ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"পৰীক্ষামূলক সতৰ্কতা"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"পৰীক্ষামূলক সতৰ্কবার্তা"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ৰাষ্ট্ৰীয় জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"জৰুৰীকালীন সতৰ্কবাৰ্তা"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"সকীয়নিমূলক সতৰ্কবাৰ্তা"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ৰাজহুৱা সুৰক্ষা বিষয়ক সতৰ্কবাৰ্তা"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"অনুশীলন"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"পৰীক্ষামূলক সতৰ্কবাৰ্তা"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"পৰীক্ষামূলক সতৰ্কবাৰ্তা"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"সকীয়নিমূলক সতৰ্কবাৰ্তাসমূহ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ৰাজহুৱা সুৰক্ষা বিষয়ক সতৰ্কবাৰ্তাসমূহ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"পৰীক্ষামূলক সতৰ্কবাৰ্তাসমূহ"</string>
 </resources>
diff --git a/res/values-mcc424-az/strings.xml b/res/values-mcc424-az/strings.xml
index a166b19..a32e9e8 100644
--- a/res/values-mcc424-az/strings.xml
+++ b/res/values-mcc424-az/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Yerli həyəcan siqnalı"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Xəbərdarlıq siqnalları"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Xəbərdarlıq siqnalları"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test siqnalı"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Test siqnalı"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Milli Həyəcan Siqnalı"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Həyəcan Siqnalı"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Həyəcan Siqnalı"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Həyəcan Siqnalı"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Həyəcan Siqnalı"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Xəbərdarlıq Siqnalı"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"İctimai Təhlükəsizlik Siqnalı"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Məşq"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test Siqnalı"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test Siqnalı"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Xəbərdarlıq Siqnalları"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"İctimai Təhlükəsizlik Siqnalları"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Sınaq siqnalları"</string>
 </resources>
diff --git a/res/values-mcc424-b+sr+Latn/strings.xml b/res/values-mcc424-b+sr+Latn/strings.xml
index d92f684..9f16886 100644
--- a/res/values-mcc424-b+sr+Latn/strings.xml
+++ b/res/values-mcc424-b+sr+Latn/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Obaveštenje o hitnom slučaju na nivou zemlje"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Obaveštenja o upozorenjima"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Obaveštenja o upozorenjima"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test obaveštenje"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Probno upozorenje"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Obaveštenje o hitnom slučaju na nivou zemlje"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Obaveštenje o hitnom slučaju"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Obaveštenje o hitnom slučaju"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Obaveštenje o hitnom slučaju"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Obaveštenje o hitnom slučaju"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Obaveštenje o upozorenju"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Obaveštenje o javnoj bezbednosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vežbanje"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Probno obaveštenje"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Probno obaveštenje"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Obaveštenja o upozorenjima"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Obaveštenja o javnoj bezbednosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Probna obaveštenja"</string>
 </resources>
diff --git a/res/values-mcc424-be/strings.xml b/res/values-mcc424-be/strings.xml
index 330b4f5..da49cbf 100644
--- a/res/values-mcc424-be/strings.xml
+++ b/res/values-mcc424-be/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Дзяржаўная абвестка пра надзвычайную сітуацыю"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Папераджальныя абвесткі"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Папераджальныя абвесткі"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тэставая абвестка"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Тэставая абвестка"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Дзяржаўная абвестка пра надзвычайную сітуацыю"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Аварыйная абвестка"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Аварыйная абвестка"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Аварыйная абвестка"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Аварыйная абвестка"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Папераджальная абвестка"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Абвестка пра пагрозу грамадскай бяспецы"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Практыкаванне"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Тэставая абвестка"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Тэставая абвестка"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Папераджальныя абвесткі"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Абвесткі пра пагрозу грамадскай бяспецы"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Тэставыя абвесткі"</string>
 </resources>
diff --git a/res/values-mcc424-bg/strings.xml b/res/values-mcc424-bg/strings.xml
index 8ab34de..e193419 100644
--- a/res/values-mcc424-bg/strings.xml
+++ b/res/values-mcc424-bg/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Сигнал при спешни случаи на национално ниво"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Сигнали за предупреждение"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Сигнали за предупреждение"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестови сигнал"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Тестови сигнал"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Сигнал при спешни случаи на национално ниво"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Сигнал при спешни случаи"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Сигнал при спешни случаи"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Сигнал при спешни случаи"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Сигнал при спешни случаи"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Сигнал за предупреждение"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Сигнал за обществена безопасност"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Упражняване"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Тестови сигнал"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Тестови сигнал"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Сигнали за предупреждение"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Сигнали за обществена безопасност"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Тестови сигнали"</string>
 </resources>
diff --git a/res/values-mcc424-bn/strings.xml b/res/values-mcc424-bn/strings.xml
index ba24cc2..189f664 100644
--- a/res/values-mcc424-bn/strings.xml
+++ b/res/values-mcc424-bn/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"জাতীয় স্তরে জরুরি সতর্কতা"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"সতর্কতা সংক্রান্ত বিজ্ঞপ্তি"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"সতর্কতা সংক্রান্ত বিজ্ঞপ্তি"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"পরীক্ষামূলকভাবে সতর্কতা জারি"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"পরীক্ষামূলকভাবে সতর্কতা জারি"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"জাতীয় স্তরে জরুরি সতর্কতা"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"জরুরি সতর্কতা"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"জরুরি সতর্কতা"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"জরুরি সতর্কতা"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"জরুরি সতর্কতা"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"সতর্কতা সংক্রান্ত বিজ্ঞপ্তি"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"সর্বজনীন নিরাপত্তা সম্পর্কিত বিজ্ঞপ্তি"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ব্যায়াম"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"পরীক্ষামূলকভাবে জারি সতর্কতা"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"পরীক্ষামূলকভাবে জারি সতর্কতা"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"সতর্কতা সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"সর্বজনীন নিরাপত্তা সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"পরীক্ষামূলকভাবে জারি সতর্কতা"</string>
 </resources>
diff --git a/res/values-mcc424-bs/strings.xml b/res/values-mcc424-bs/strings.xml
index eae0adc..2d2c6ff 100644
--- a/res/values-mcc424-bs/strings.xml
+++ b/res/values-mcc424-bs/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Državno upozorenje za hitan slučaj"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Upozorenja"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Upozorenja"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testno upozorenje"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testno upozorenje"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Državno upozorenje za hitan slučaj"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Upozorenje za hitan slučaj"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Upozorenje za hitan slučaj"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Upozorenje za hitan slučaj"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Upozorenje za hitan slučaj"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Upozorenje"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Upozorenje o javnoj sigurnosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vježbanje"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testno upozorenje"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testno upozorenje"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Upozorenja"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Upozorenja o javnoj sigurnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testna upozorenja"</string>
 </resources>
diff --git a/res/values-mcc424-ca/strings.xml b/res/values-mcc424-ca/strings.xml
index 0c89da3..058a683 100644
--- a/res/values-mcc424-ca/strings.xml
+++ b/res/values-mcc424-ca/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta d\'emergència nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alertes"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertes"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prova"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alerta de prova"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta d\'emergències nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta d\'emergències"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta d\'emergències"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta d\'emergències"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta d\'emergències"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de seguretat pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercici"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de prova"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de prova"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertes"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertes de seguretat públiques"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertes de prova"</string>
 </resources>
diff --git a/res/values-mcc424-cs/strings.xml b/res/values-mcc424-cs/strings.xml
index 4886266..e7d8ed1 100644
--- a/res/values-mcc424-cs/strings.xml
+++ b/res/values-mcc424-cs/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Celostátní nouzová výstraha"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Varování"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Varování"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testovací výstraha"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testovací výstraha"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Celostátní výstražná zpráva"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Výstražná zpráva"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Výstražná zpráva"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Výstražná zpráva"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Výstražná zpráva"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Upozornění"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Upozornění ohledně veřejné bezpečnosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Cvičení"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testovací upozornění"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testovací upozornění"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Varování"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Upozornění ohledně veřejné bezpečnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testovací upozornění"</string>
 </resources>
diff --git a/res/values-mcc424-da/strings.xml b/res/values-mcc424-da/strings.xml
index 707f774..cfdce4c 100644
--- a/res/values-mcc424-da/strings.xml
+++ b/res/values-mcc424-da/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National nødalarm"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Advarsler"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Advarsler"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testalarm"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testalarm"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National nødunderretning"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Nødunderretning"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Nødunderretning"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Nødunderretning"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Nødunderretning"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Advarselsunderretning"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Offentlig sikkerhedsunderretninger"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Motion"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testunderretning"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testunderretning"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Advarselsunderretninger"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Offentlige sikkerhedsunderretninger"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testunderretninger"</string>
 </resources>
diff --git a/res/values-mcc424-de/strings.xml b/res/values-mcc424-de/strings.xml
index 843d957..cea642c 100644
--- a/res/values-mcc424-de/strings.xml
+++ b/res/values-mcc424-de/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nationale Notfallwarnung"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Warnungen"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warnungen"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testwarnung"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testwarnung"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nationale Notfallwarnung"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Notfallwarnung"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Notfallwarnung"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Notfallwarnung"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Notfallwarnung"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warnung"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Warnung zur öffentlichen Sicherheit"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Sport"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testwarnung"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testwarnung"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warnungen"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Warnungen zur öffentlichen Sicherheit"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testwarnungen"</string>
 </resources>
diff --git a/res/values-mcc424-el/strings.xml b/res/values-mcc424-el/strings.xml
index 8791078..9d718d2 100644
--- a/res/values-mcc424-el/strings.xml
+++ b/res/values-mcc424-el/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Ειδοποίηση κατάστασης εθνικής έκτακτης ανάγκης"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Ειδοποιήσεις προειδοποίησης"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Ειδοποιήσεις προειδοποίησης"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Δοκιμαστική ειδοποίηση"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Δοκιμαστική ειδοποίηση"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Ειδοποίηση κατάστασης εθνικής έκτακτης ανάγκης"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Ειδοποίηση προειδοποίησης"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Ειδοποίηση δημόσιας ασφάλειας"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Άσκηση"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Δοκιμαστική ειδοποίηση"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Δοκιμαστική ειδοποίηση"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Ειδοποιήσεις προειδοποίησης"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Ειδοποιήσεις δημόσιας ασφάλειας"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Δοκιμαστικές ειδοποιήσεις"</string>
 </resources>
diff --git a/res/values-mcc424-en-rAU/strings.xml b/res/values-mcc424-en-rAU/strings.xml
index 037be2d..bc9c30e 100644
--- a/res/values-mcc424-en-rAU/strings.xml
+++ b/res/values-mcc424-en-rAU/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Warning alerts"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warning alerts"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Test alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Emergency alert"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Emergency alert"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warning alert"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Public safety alert"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercise"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test alert"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test alert"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warning alerts"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Public safety alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test alerts"</string>
 </resources>
diff --git a/res/values-mcc424-en-rCA/strings.xml b/res/values-mcc424-en-rCA/strings.xml
index 037be2d..bc9c30e 100644
--- a/res/values-mcc424-en-rCA/strings.xml
+++ b/res/values-mcc424-en-rCA/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Warning alerts"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warning alerts"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Test alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Emergency alert"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Emergency alert"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warning alert"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Public safety alert"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercise"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test alert"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test alert"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warning alerts"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Public safety alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test alerts"</string>
 </resources>
diff --git a/res/values-mcc424-en-rGB/strings.xml b/res/values-mcc424-en-rGB/strings.xml
index 037be2d..bc9c30e 100644
--- a/res/values-mcc424-en-rGB/strings.xml
+++ b/res/values-mcc424-en-rGB/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Warning alerts"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warning alerts"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Test alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Emergency alert"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Emergency alert"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warning alert"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Public safety alert"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercise"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test alert"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test alert"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warning alerts"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Public safety alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test alerts"</string>
 </resources>
diff --git a/res/values-mcc424-en-rIN/strings.xml b/res/values-mcc424-en-rIN/strings.xml
index 037be2d..bc9c30e 100644
--- a/res/values-mcc424-en-rIN/strings.xml
+++ b/res/values-mcc424-en-rIN/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"National emergency alert"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Warning alerts"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Warning alerts"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test alert"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Test alert"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"National emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Emergency alert"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Emergency alert"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Emergency alert"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Warning alert"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Public safety alert"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercise"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test alert"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test alert"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Warning alerts"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Public safety alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test alerts"</string>
 </resources>
diff --git a/res/values-mcc424-en-rXC/strings.xml b/res/values-mcc424-en-rXC/strings.xml
index 13a33f3..48b2be4 100644
--- a/res/values-mcc424-en-rXC/strings.xml
+++ b/res/values-mcc424-en-rXC/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎National emergency alert‎‏‎‎‏‎"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎Warning alerts‎‏‎‎‏‎"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎Warning alerts‎‏‎‎‏‎"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‎Test alert‎‏‎‎‏‎"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎Test alert‎‏‎‎‏‎"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎National Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‏‏‏‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎Warning Alert‎‏‎‎‏‎"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎Public Safety Alert‎‏‎‎‏‎"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‎Exercise‎‏‎‎‏‎"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‎‎‎Test Alert‎‏‎‎‏‎"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎Test Alert‎‏‎‎‏‎"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎Warning Alerts‎‏‎‎‏‎"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‎Public Safety Alerts‎‏‎‎‏‎"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎Test Alerts‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-mcc424-es-rUS/strings.xml b/res/values-mcc424-es-rUS/strings.xml
index c4023ba..762f51f 100644
--- a/res/values-mcc424-es-rUS/strings.xml
+++ b/res/values-mcc424-es-rUS/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergencia nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alertas de advertencia"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de advertencia"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prueba"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alerta de prueba"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta de emergencia nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emergencia"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emergencia"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emergencia"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emergencia"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de advertencia"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de seguridad pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Ejercicio"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de prueba"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de prueba"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de advertencia"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de seguridad pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de prueba"</string>
 </resources>
diff --git a/res/values-mcc424-es/strings.xml b/res/values-mcc424-es/strings.xml
index ff4bfbe..21a686b 100644
--- a/res/values-mcc424-es/strings.xml
+++ b/res/values-mcc424-es/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergencia nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alertas de advertencia"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de advertencia"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de prueba"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alerta de prueba"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta de emergencia nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emergencia"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emergencia"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emergencia"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emergencia"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de advertencia"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de seguridad pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Deporte"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de prueba"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de prueba"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de advertencia"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de seguridad pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de prueba"</string>
 </resources>
diff --git a/res/values-mcc424-et/strings.xml b/res/values-mcc424-et/strings.xml
index efb517a..5a77bb4 100644
--- a/res/values-mcc424-et/strings.xml
+++ b/res/values-mcc424-et/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Riiklik hädaolukorra märguanne"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Hoiatused"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Hoiatused"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testmärguanne"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testhoiatus"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Riiklik hädaolukorra märguanne"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Hädaolukorra märguanne"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Hädaolukorra märguanne"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Hädaolukorra märguanne"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Hädaolukorra märguanne"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Hoiatusmärguanne"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Avalik ohutusmärguanne"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Treening"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testhoiatus"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testhoiatus"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Hoiatusmärguanded"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Avalikud ohutusmärguanded"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testhoiatused"</string>
 </resources>
diff --git a/res/values-mcc424-eu/strings.xml b/res/values-mcc424-eu/strings.xml
index 869a04e..d41a0c9 100644
--- a/res/values-mcc424-eu/strings.xml
+++ b/res/values-mcc424-eu/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Larrialdi-alerta nazionala"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Abisuen alertak"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Abisuen alertak"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Probako alerta"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Probako alerta"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Larrialdi-alerta nazionala"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Larrialdi-alerta"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Larrialdi-alerta"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Larrialdi-alerta"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Larrialdi-alerta"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Abisuen alerta"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Segurtasun publikoari buruzko alerta"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Ariketa fisikoa"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testu-mezu bidezko alerta"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testu-mezu bidezko alerta"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Abisuen alertak"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Segurtasun publikoari buruzko alertak"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testu-mezu bidezko alertak"</string>
 </resources>
diff --git a/res/values-mcc424-fa/strings.xml b/res/values-mcc424-fa/strings.xml
index fbf9484..a3b9f5a 100644
--- a/res/values-mcc424-fa/strings.xml
+++ b/res/values-mcc424-fa/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"اعلام خطر اضطرای در کشور"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"هشدارهای خطر"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"هشدارهای خطر"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"اعلام خطر آزمایشی"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"هشدار آزمایشی"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"هشدار وضعیت اضطراری ملی"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"هشدار وضعیت اضطراری"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"هشدار وضعیت اضطراری"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"هشدار وضعیت اضطراری"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"هشدار وضعیت اضطراری"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"هشدار خطر"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"هشدار ایمنی عمومی"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"تمرین"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"هشدار آزمایشی"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"هشدار آزمایشی"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"هشدارهای خطر"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"هشدارهای ایمنی عمومی"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"هشدارهای آزمایشی"</string>
 </resources>
diff --git a/res/values-mcc424-fi/strings.xml b/res/values-mcc424-fi/strings.xml
index 4fd8179..7d9e39b 100644
--- a/res/values-mcc424-fi/strings.xml
+++ b/res/values-mcc424-fi/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Kansallinen hätäilmoitus"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Varoitukset"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Varoitukset"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testihälytys"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testihälytys"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Kansallinen vaaratiedote"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Vaaratiedote"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Vaaratiedote"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Vaaratiedote"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Vaaratiedote"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Varoitus"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Yleistä turvallisuutta koskeva tiedote"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Liikunta"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testitiedote"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testitiedote"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Varoitukset"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Yleistä turvallisuutta koskevat tiedotteet"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testitiedotteet"</string>
 </resources>
diff --git a/res/values-mcc424-fr-rCA/strings.xml b/res/values-mcc424-fr-rCA/strings.xml
index 56bbd8d..c440c67 100644
--- a/res/values-mcc424-fr-rCA/strings.xml
+++ b/res/values-mcc424-fr-rCA/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerte d\'urgence nationale"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alertes d\'avertissement"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertes d\'avertissement"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerte test"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alerte test"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerte d\'urgence nationale"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerte d\'urgence"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerte d\'urgence"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerte d\'urgence"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerte d\'urgence"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerte d\'avertissement"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerte relative à la sécurité publique"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercice"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerte test"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerte test"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertes d\'avertissement"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertes relatives à la sécurité publique"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertes tests"</string>
 </resources>
diff --git a/res/values-mcc424-fr/strings.xml b/res/values-mcc424-fr/strings.xml
index 56bbd8d..05a4298 100644
--- a/res/values-mcc424-fr/strings.xml
+++ b/res/values-mcc424-fr/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerte d\'urgence nationale"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alertes d\'avertissement"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertes d\'avertissement"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerte test"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alerte test"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerte d\'urgence nationale"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerte d\'urgence"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerte d\'urgence"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerte d\'urgence"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerte d\'urgence"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerte d\'avertissement"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerte de sécurité publique"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercice"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerte de test"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerte de test"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertes d\'avertissement"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertes de sécurité publique"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertes de test"</string>
 </resources>
diff --git a/res/values-mcc424-gl/strings.xml b/res/values-mcc424-gl/strings.xml
index 70f2ed9..e9bb2ee 100644
--- a/res/values-mcc424-gl/strings.xml
+++ b/res/values-mcc424-gl/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta nacional de emerxencia"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alertas de advertencia"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de advertencia"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de proba"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alerta de proba"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta nacional de emerxencia"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emerxencia"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emerxencia"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emerxencia"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emerxencia"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de advertencia"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de seguranza pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercicio"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de proba"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de proba"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de advertencia"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de seguranza pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de proba"</string>
 </resources>
diff --git a/res/values-mcc424-gu/strings.xml b/res/values-mcc424-gu/strings.xml
index 5c86b0c..8770f3b 100644
--- a/res/values-mcc424-gu/strings.xml
+++ b/res/values-mcc424-gu/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"રાષ્ટ્રીય કટોકટીની અલર્ટ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"ચેતવણીના અલર્ટ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ચેતવણીના અલર્ટ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"પરીક્ષણ અલર્ટ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"પરીક્ષણ અલર્ટ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"રાષ્ટ્રીય ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ઇમર્જન્સી માટે અલર્ટ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ચેતવણી માટે અલર્ટ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"લોકોની સલામતી માટે અલર્ટ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"વ્યાયામ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"પરીક્ષણ માટે અલર્ટ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"પરીક્ષણ માટે અલર્ટ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ચેતવણી માટે અલર્ટ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"લોકોની સલામતી માટે અલર્ટ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"પરીક્ષણ માટે અલર્ટ"</string>
 </resources>
diff --git a/res/values-mcc424-hi/strings.xml b/res/values-mcc424-hi/strings.xml
index 900e35e..0188b81 100644
--- a/res/values-mcc424-hi/strings.xml
+++ b/res/values-mcc424-hi/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रीय आपातकालीन अलर्ट"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"चेतावनियां"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"चेतावनियां"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"टेस्ट अलर्ट"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"टेस्ट अलर्ट"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"आपातकालीन स्थिति के लिए राष्ट्रीय स्तर पर चेतावनी"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"आपातकालीन स्थिति के लिए चेतावनी"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"आपातकालीन स्थिति के लिए चेतावनी"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"आपातकालीन स्थिति के लिए चेतावनी"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"आपातकालीन स्थिति के लिए चेतावनी"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"चेतावनी की सूचना"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"सार्वजनिक सुरक्षा की चेतावनी"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"व्यायाम"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"टेस्ट अलर्ट"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"टेस्ट अलर्ट"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"चेतावनी की सूचना"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"सार्वजनिक सुरक्षा की चेतावनियां"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"टेस्ट अलर्ट"</string>
 </resources>
diff --git a/res/values-mcc424-hr/strings.xml b/res/values-mcc424-hr/strings.xml
index a9f5ff2..aa8f37d 100644
--- a/res/values-mcc424-hr/strings.xml
+++ b/res/values-mcc424-hr/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nacionalno hitno upozorenje"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Upozorenja o opasnosti"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Upozorenja o opasnosti"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testno upozorenje"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testno upozorenje"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nacionalno hitno upozorenje"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Hitno upozorenje"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Hitno upozorenje"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Hitno upozorenje"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Hitno upozorenje"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Upozorenje o opasnosti"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Upozorenje o javnoj sigurnosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vježba"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testno upozorenje"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testno upozorenje"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Upozorenja o opasnosti"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Upozorenja o javnoj sigurnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testna upozorenja"</string>
 </resources>
diff --git a/res/values-mcc424-hu/strings.xml b/res/values-mcc424-hu/strings.xml
index 8932427..bf0bcdc 100644
--- a/res/values-mcc424-hu/strings.xml
+++ b/res/values-mcc424-hu/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Országos szükségállapotról szóló riasztás"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Figyelmeztető riasztások"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Figyelmeztető riasztások"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Próbariasztás"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Próbariasztás"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Országos szükségállapotról szóló riasztás"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Vészjelzés"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Vészjelzés"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Vészjelzés"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Vészjelzés"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Figyelmeztető riasztás"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Közbiztonsággal kapcsolatos riasztás"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Edzés"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Próbariasztás"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Próbariasztás"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Figyelmeztető riasztások"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Közbiztonsággal kapcsolatos riasztások"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Próbariasztások"</string>
 </resources>
diff --git a/res/values-mcc424-hy/strings.xml b/res/values-mcc424-hy/strings.xml
index 5865a19..6a68c0d 100644
--- a/res/values-mcc424-hy/strings.xml
+++ b/res/values-mcc424-hy/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Արտակարգ իրավիճակի համապետական ահազանգ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Նախազգուշացումներ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Նախազգուշացումներ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Փորձնական ահազանգ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Փորձնական ահազանգ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Արտակարգ իրավիճակի համապետական ազդարարում"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Արտակարգ իրավիճակի ազդարարում"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Արտակարգ իրավիճակի ազդարարում"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Արտակարգ իրավիճակի ազդարարում"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Արտակարգ իրավիճակի ազդարարում"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Նախազգուշացում"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Ազդարարում հանրային անվտանգության սպառնալիքի մասին"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Վարժություն"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Փորձնական ազդարարում"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Փորձնական ազդարարում"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Նախազգուշացումներ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Ազդարարումներ հանրային անվտանգության սպառնալիքի մասին"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Փորձնական ազդարարումներ"</string>
 </resources>
diff --git a/res/values-mcc424-in/strings.xml b/res/values-mcc424-in/strings.xml
index d578e7b..75dbeba 100644
--- a/res/values-mcc424-in/strings.xml
+++ b/res/values-mcc424-in/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Peringatan darurat nasional"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Notifikasi peringatan"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Notifikasi peringatan"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Uji peringatan"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Peringatan pengujian"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Peringatan Darurat Nasional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Notifikasi Darurat"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Notifikasi Darurat"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Notifikasi Darurat"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Notifikasi Darurat"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Notifikasi Peringatan"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Peringatan Keamanan Publik"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Latihan"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Uji Peringatan"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Uji Peringatan"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Notifikasi Peringatan"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Peringatan Keamanan Publik"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Uji Peringatan"</string>
 </resources>
diff --git a/res/values-mcc424-is/strings.xml b/res/values-mcc424-is/strings.xml
index 3daab82..97a2288 100644
--- a/res/values-mcc424-is/strings.xml
+++ b/res/values-mcc424-is/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Innlend neyðarviðvörun"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Viðvaranir"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Viðvaranir"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Prufuviðvörun"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Prufuviðvörun"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Innlend neyðarviðvörun"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Neyðarviðvörun"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Neyðarviðvörun"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Neyðarviðvörun"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Neyðarviðvörun"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Viðvörun"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Almannavarnatilkynning"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Æfingar"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Prufuviðvörun"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Prufuviðvörun"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Viðvaranir"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Almannavarnatilkynningar"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Prufuviðvaranir"</string>
 </resources>
diff --git a/res/values-mcc424-it/strings.xml b/res/values-mcc424-it/strings.xml
index cf708a6..bcccc5e 100644
--- a/res/values-mcc424-it/strings.xml
+++ b/res/values-mcc424-it/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Avviso d\'emergenza nazionale"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Avvisi"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Avvisi"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Avviso di prova"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Avviso di prova"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Avviso di emergenza nazionale"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Avviso di emergenza"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Avviso di emergenza"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Avviso di emergenza"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Avviso di emergenza"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Allerta"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Allerta sicurezza pubblica"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Esercitazione"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Avviso di prova"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Avviso di prova"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Allerte"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Allerte sicurezza pubblica"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Avvisi di prova"</string>
 </resources>
diff --git a/res/values-mcc424-iw/strings.xml b/res/values-mcc424-iw/strings.xml
index b2702a0..c0e718a 100644
--- a/res/values-mcc424-iw/strings.xml
+++ b/res/values-mcc424-iw/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"התרעה על מקרה חירום לאומי"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"התראות אזהרה"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"התראות אזהרה"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"התראת בדיקה"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"התראת בדיקה"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"התראה על מקרה חירום לאומי"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"התראת חירום"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"התראת חירום"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"התראת חירום"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"התראת חירום"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"התראת אזהרה"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"התראה בנוגע לביטחון הציבור"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"פעילות גופנית"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"התראת בדיקה"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"התראת בדיקה"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"התראות אזהרה"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"התראות בנוגע לביטחון הציבור"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"התרעות בדיקה"</string>
 </resources>
diff --git a/res/values-mcc424-ja/strings.xml b/res/values-mcc424-ja/strings.xml
index 54bdc8f..0eaa554 100644
--- a/res/values-mcc424-ja/strings.xml
+++ b/res/values-mcc424-ja/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"緊急速報メール(国内)"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"警告アラート"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"警告アラート"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"テストアラート"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"テストアラート"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"緊急速報メール(国内)"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"緊急速報メール"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"緊急速報メール"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"緊急速報メール"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"緊急速報メール"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"警告アラート"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"災害情報アラート"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"エクササイズ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"テストアラート"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"テストアラート"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"警告アラート"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"災害情報アラート"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"テストアラート"</string>
 </resources>
diff --git a/res/values-mcc424-ka/strings.xml b/res/values-mcc424-ka/strings.xml
index aa5a1f1..d28c5dc 100644
--- a/res/values-mcc424-ka/strings.xml
+++ b/res/values-mcc424-ka/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ეროვნული საგანგებო გაფრთხილება"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"გამაფრთხილებელი განგაშის სიგნალები"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"გამაფრთხილებელი განგაშის სიგნალები"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"სატესტო გაფრთხილება"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"სატესტო გაფრთხილება"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ეროვნული საგანგებო გაფრთხილება"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"საგანგებო გაფრთხილება"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"საგანგებო გაფრთხილება"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"საგანგებო გაფრთხილება"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"საგანგებო გაფრთხილება"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"გამაფრთხილებელი განგაში"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"საჯარო უსაფრთხოების გაფრთხილება"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ვარჯიში"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"სატესტო გაფრთხილება"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"სატესტო გაფრთხილება"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"გამაფრთხილებელი შეტყობინებები"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"საჯარო უსაფრთხოების გაფრთხილებები"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"სატესტო გაფრთხილებები"</string>
 </resources>
diff --git a/res/values-mcc424-kk/strings.xml b/res/values-mcc424-kk/strings.xml
index f7321a1..0cf8adc 100644
--- a/res/values-mcc424-kk/strings.xml
+++ b/res/values-mcc424-kk/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Елдегі төтенше жағдай туралы ескерту"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Хабарландыру ескертулері"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Хабарландыру ескертулері"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сынақ ескерту"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Сынақ ескерту"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Елдегі төтенше жағдай туралы ескерту"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Төтенше жағдай дабылы"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Төтенше жағдай дабылы"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Төтенше жағдай дабылы"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Төтенше жағдай дабылы"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Ескерту"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Жалпы қауіпсіздік ескертуі"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Жаттығу"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Сынақ ескерту"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Сынақ ескерту"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Ескертулер"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Халыққа арналған қауіпсіздік туралы хабарландырулар"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Сынақ ескертулер"</string>
 </resources>
diff --git a/res/values-mcc424-km/strings.xml b/res/values-mcc424-km/strings.xml
index ad66f3c..aaf6090 100644
--- a/res/values-mcc424-km/strings.xml
+++ b/res/values-mcc424-km/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ការ​ជូន​ដំណឹង​ពេល​អាសន្នថ្នាក់ជាតិ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"ការជូនដំណឹង​អំពី​ការព្រមាន"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ការជូនដំណឹង​អំពី​ការព្រមាន"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ការ​ជូន​ដំណឹងសាកល្បង"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"ការ​ជូន​ដំណឹងសាកល្បង"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ការ​ជូន​ដំណឹង​ពេល​អាសន្នថ្នាក់ជាតិ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ការជូនដំណឹង​អំពីការព្រមាន"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ការជូនដំណឹង​អំពីសុវត្ថិភាព​សាធារណៈ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"លំហាត់"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ការ​ជូន​ដំណឹងសាកល្បង"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ការ​ជូន​ដំណឹងសាកល្បង"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ការជូនដំណឹង​អំពី​ការព្រមាន"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ការជូនដំណឹង​អំពីសុវត្ថិភាព​សាធារណៈ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ការជូនដំណឹង​សាកល្បង"</string>
 </resources>
diff --git a/res/values-mcc424-kn/strings.xml b/res/values-mcc424-kn/strings.xml
index e779b02..21453a3 100644
--- a/res/values-mcc424-kn/strings.xml
+++ b/res/values-mcc424-kn/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ರಾಷ್ಟ್ರೀಯ ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"ಎಚ್ಚರಿಕೆ ಅಲರ್ಟ್‌ಗಳು"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ಎಚ್ಚರಿಕೆ ಅಲರ್ಟ್‌ಗಳು"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ಪರೀಕ್ಷಾ ಎಚ್ಚರಿಕೆ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"ಪರೀಕ್ಷಾ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ರಾಷ್ಟ್ರೀಯ ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ಮುನ್ಸೂಚನೆಯ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತೆಯ ಎಚ್ಚರಿಕೆ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ವ್ಯಾಯಾಮ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ಪರೀಕ್ಷೆ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ಪರೀಕ್ಷೆ ಎಚ್ಚರಿಕೆ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ಮುನ್ಸೂಚನೆಯ ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ಸಾರ್ವಜನಿಕ ಸುರಕ್ಷತೆಯ ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ಪರೀಕ್ಷೆ ಎಚ್ಚರಿಕೆಗಳು"</string>
 </resources>
diff --git a/res/values-mcc424-ko/strings.xml b/res/values-mcc424-ko/strings.xml
index 3de4019..e4c5803 100644
--- a/res/values-mcc424-ko/strings.xml
+++ b/res/values-mcc424-ko/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"국가 응급 상황 알림"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"경고"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"경고"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"시험 알림"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"시험 알림"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"국가 비상사태 알림"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"비상사태 알림"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"비상사태 알림"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"비상사태 알림"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"비상사태 알림"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"경고 알림"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"공공 안전 알림"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"운동"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"테스트 알림"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"테스트 알림"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"경고 알림"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"공공 안전 알림"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"테스트 알림"</string>
 </resources>
diff --git a/res/values-mcc424-ky/strings.xml b/res/values-mcc424-ky/strings.xml
index 8c9af98..4119af7 100644
--- a/res/values-mcc424-ky/strings.xml
+++ b/res/values-mcc424-ky/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Улуттук шашылыш билдирүү"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Эскертүүлөр"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Эскертүүлөр"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сынамык шашылыш билдирүү"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Сынамык шашылыш билдирүү"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Жалпы улуттук шашылыш билдирүү"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Шашылыш билдирүү"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Шашылыш билдирүү"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Шашылыш билдирүү"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Шашылыш билдирүү"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Эскертүү"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Коомдук коопсуздукка келтирилип жаткан коркунуч тууралуу билдирүү"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Көнүгүү"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Сынамык шашылыш билдирүү"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Сынамык шашылыш билдирүү"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Эскертүүлөр"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Коомдук коопсуздукка келтирилип жаткан коркунуч тууралуу билдирүүлөр"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Сынамык шашылыш билдирүүлөр"</string>
 </resources>
diff --git a/res/values-mcc424-lo/strings.xml b/res/values-mcc424-lo/strings.xml
index e5a8def..c10d811 100644
--- a/res/values-mcc424-lo/strings.xml
+++ b/res/values-mcc424-lo/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ການເຕືອນສຸກເສີນລະດັບປະເທດ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"ຄຳເຕືອນ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ຄຳເຕືອນ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ທົດສອບການເຕືອນ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"ທົດສອບການເຕືອນ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ແຈ້ງເຕືອນສຸກເສີນລະດັບປະເທດ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ແຈ້ງເຕືອນຄຳເຕືອນ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ແຈ້ງເຕືອນຄວາມປອດໄພສາທາລະນະ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ອອກກຳລັງກາຍ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ທົດສອບແຈ້ງເຕືອນ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ທົດສອບແຈ້ງເຕືອນ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ແຈ້ງເຕືອນຄຳເຕືອນ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ແຈ້ງເຕືອນຄວາມປອດໄພສາທາລະນະ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ທົດສອດແຈ້ງເຕືອນ"</string>
 </resources>
diff --git a/res/values-mcc424-lt/strings.xml b/res/values-mcc424-lt/strings.xml
index 33e5c22..5d8a939 100644
--- a/res/values-mcc424-lt/strings.xml
+++ b/res/values-mcc424-lt/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nacionalinis nepaprastosios padėties įspėjimas"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Įspėjimai"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Įspėjimai"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Bandomasis įspėjimas"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Bandomasis įspėjimas"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nacionalinis įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Įspėjimas"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Visuomenės saugumo įspėjimas"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Mankšta"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Bandomasis įspėjimas"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Bandomasis įspėjimas"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Įspėjimai"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Visuomenės saugumo įspėjimai"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Bandomieji įspėjimai"</string>
 </resources>
diff --git a/res/values-mcc424-lv/strings.xml b/res/values-mcc424-lv/strings.xml
index a9d9f13..b874682 100644
--- a/res/values-mcc424-lv/strings.xml
+++ b/res/values-mcc424-lv/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Valsts līmeņa ārkārtas brīdinājums"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Brīdinājumi"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Brīdinājumi"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testa brīdinājums"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testa brīdinājums"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Valsts līmeņa ārkārtas brīdinājums"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Ārkārtas brīdinājums"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Ārkārtas brīdinājums"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Ārkārtas brīdinājums"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Ārkārtas brīdinājums"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Brīdinājums"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Brīdinājums par sabiedrisko drošību"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vingrošana"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testa brīdinājums"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testa brīdinājums"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Brīdinājumi"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Brīdinājumi par sabiedrisko drošību"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testa brīdinājumi"</string>
 </resources>
diff --git a/res/values-mcc424-mk/strings.xml b/res/values-mcc424-mk/strings.xml
index 40636e5..67fd37d 100644
--- a/res/values-mcc424-mk/strings.xml
+++ b/res/values-mcc424-mk/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Национално предупредување за итни случаи"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Известувања за предупредување"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Известувања за предупредување"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Предупредување за тестирање"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Предупредување за тестирање"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Национално предупредување за итни случаи"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Предупредувања за итни случаи"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Предупредувања за итни случаи"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Предупредувања за итни случаи"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Предупредувања за итни случаи"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Предупредување за опомена"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Предупредување за јавна безбедност"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Вежбање"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Пробно предупредување"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Пробно предупредување"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Предупредувања за опомена"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Предупредувања за јавна безбедност"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Пробни предупредувања"</string>
 </resources>
diff --git a/res/values-mcc424-ml/strings.xml b/res/values-mcc424-ml/strings.xml
index 6e8e2a7..517544a 100644
--- a/res/values-mcc424-ml/strings.xml
+++ b/res/values-mcc424-ml/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ദേശീയ അടിയന്തര അലേർട്ട്"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"മുന്നറിയിപ്പുകൾ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"മുന്നറിയിപ്പുകൾ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"പരീക്ഷണ അലേർട്ട്"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"പരീക്ഷണ മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ദേശീയ അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"അടിയന്തര മുന്നറിയിപ്പ്"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"മുന്നറിയിപ്പ്"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"പൊതു സുരക്ഷാ മുന്നറിയിപ്പ്"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"വ്യായാമം"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"പരീക്ഷണ മുന്നറിയിപ്പ്"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"പരീക്ഷണ മുന്നറിയിപ്പ്"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"മുന്നറിയിപ്പുകൾ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"പൊതു സുരക്ഷാ മുന്നറിയിപ്പുകൾ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"പരീക്ഷണ മുന്നറിയിപ്പുകൾ"</string>
 </resources>
diff --git a/res/values-mcc424-mn/strings.xml b/res/values-mcc424-mn/strings.xml
index 70a19e2..7c456aa 100644
--- a/res/values-mcc424-mn/strings.xml
+++ b/res/values-mcc424-mn/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Онцгой байдлын үндэсний сэрэмжлүүлэг"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Анхааруулах сэрэмжлүүлэг"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Анхааруулах сэрэмжлүүлэг"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Сэрэмжлүүлгийг шалгах"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Сэрэмжлүүлгийг шалгах"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Үндэсний онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Онцгой байдлын сэрэмжлүүлэг"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Анхааруулах сэрэмжлүүлэг"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Олон нийтийн аюулгүй байдлын сэрэмжлүүлэг"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Сургуулилт"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Туршилтын сэрэмжлүүлэг"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Туршилтын сэрэмжлүүлэг"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Анхааруулах сэрэмжлүүлэг"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Олон нийтийн аюулгүй байдлын сэрэмжлүүлэг"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Туршилтын сэрэмжлүүлэг"</string>
 </resources>
diff --git a/res/values-mcc424-mr/strings.xml b/res/values-mcc424-mr/strings.xml
index eb61a60..bfd30bc 100644
--- a/res/values-mcc424-mr/strings.xml
+++ b/res/values-mcc424-mr/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रीय आणीबाणीच्या सूचना"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"चेतावणी सूचना"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"चेतावणी सूचना"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"चाचणी सूचना"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"चाचणी सूचना"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"राष्ट्रीय आणीबाणीची सूचना"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"आणीबाणीची सूचना"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"आणीबाणीची सूचना"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"आणीबाणीची सूचना"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"आणीबाणीची सूचना"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"चेतावणीची सूचना"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"सार्वजनिक सुरक्षिततेची सूचना"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"एक्ससाइझ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"चाचणीची सूचना"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"चाचणीची सूचना"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"चेतावणीच्या सूचना"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"सार्वजनिक सुरक्षिततेच्या सूचना"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"चाचणी अलर्ट"</string>
 </resources>
diff --git a/res/values-mcc424-ms/strings.xml b/res/values-mcc424-ms/strings.xml
index 9b14e83..f4f6061 100644
--- a/res/values-mcc424-ms/strings.xml
+++ b/res/values-mcc424-ms/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Amaran kecemasan nasional"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Makluman amaran"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Makluman amaran"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Makluman ujian"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Makluman ujian"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Amaran Kecemasan Nasional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Amaran Kecemasan"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Amaran Kecemasan"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Amaran Kecemasan"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Amaran Kecemasan"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Makluman Amaran"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Makluman Keselamatan Awam"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Senaman"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Makluman Ujian"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Makluman Ujian"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Makluman Amaran"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Makluman Keselamatan Awam"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Makluman Ujian"</string>
 </resources>
diff --git a/res/values-mcc424-my/strings.xml b/res/values-mcc424-my/strings.xml
index 400cfd8..2560295 100644
--- a/res/values-mcc424-my/strings.xml
+++ b/res/values-mcc424-my/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"နိုင်ငံတော်နှင့်ဆိုင်သော အရေးပေါ် သတိပေးချက်"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"သတိပေးချက်များ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"သတိပေးချက်များ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"စမ်းသပ် သတိပေးချက်"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"စမ်းသပ် သတိပေးချက်"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"နိုင်ငံတော်နှင့်ဆိုင်သော အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"အရေးပေါ် သတိပေးချက်"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"အရေးပေါ် သတိပေးချက်"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"သတိပေး အချက်ပြမှု"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"လူထုလုံခြုံရေး သတိပေးချက်"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ကိုယ်ကာယလေ့ကျင့်ခန်း"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"စမ်းသပ် သတိပေးချက်"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"စမ်းသပ် သတိပေးချက်"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"သတိပေး အချက်ပြမှုများ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"လူထုလုံခြုံရေး သတိပေးချက်များ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"စမ်းသပ် သတိပေးချက်များ"</string>
 </resources>
diff --git a/res/values-mcc424-nb/strings.xml b/res/values-mcc424-nb/strings.xml
index e5a4e59..5dacdb3 100644
--- a/res/values-mcc424-nb/strings.xml
+++ b/res/values-mcc424-nb/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nasjonalt nødvarsel"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Varsler"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Varsler"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testvarsel"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testvarsel"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nasjonalt nødvarsel"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Nødvarsel"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Nødvarsel"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Nødvarsel"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Nødvarsel"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Advarsel"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Offentlig sikkerhetsvarsel"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Trening"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testvarsel"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testvarsel"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Varsler"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Offentlige sikkerhetsvarsler"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testvarsler"</string>
 </resources>
diff --git a/res/values-mcc424-ne/strings.xml b/res/values-mcc424-ne/strings.xml
index 95cb1bc..6ee7181 100644
--- a/res/values-mcc424-ne/strings.xml
+++ b/res/values-mcc424-ne/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"राष्ट्रिय आपातकालीन अलर्ट"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"चेतावनीसम्बन्धी सतर्कताहरू"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"चेतावनीसम्बन्धी सतर्कताहरू"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"परीक्षण अलर्ट"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"परीक्षण अलर्ट"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"राष्ट्रिय आपात्‌कालीन अलर्ट"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"आपत्‌कालीन अलर्ट"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"आपत्‌कालीन अलर्ट"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"आपत्‌कालीन अलर्ट"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"आपत्‌कालीन अलर्ट"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"चेतावनीसम्बन्धी अलर्ट"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"सार्वजनिक सुरक्षासम्बन्धी अलर्ट"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"व्यायाम"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"परीक्षणसम्बन्धी अलर्ट"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"परीक्षणसम्बन्धी अलर्ट"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"चेतावनीसम्बन्धी अलर्टहरू"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"सार्वजनिक सुरक्षासम्बन्धी अलर्टहरू"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"जाँचसम्बन्धी अलर्टहरू"</string>
 </resources>
diff --git a/res/values-mcc424-nl/strings.xml b/res/values-mcc424-nl/strings.xml
index c2dfe1f..b8e2da4 100644
--- a/res/values-mcc424-nl/strings.xml
+++ b/res/values-mcc424-nl/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Nationale noodmelding"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Waarschuwingsmeldingen"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Waarschuwingsmeldingen"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testmelding"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testmelding"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Nationale noodmelding"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Noodmelding"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Noodmelding"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Noodmelding"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Noodmelding"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Waarschuwingsmelding"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Openbare veiligheidsmelding"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Bewegen"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testmelding"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testmelding"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Waarschuwingsmeldingen"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Openbare veiligheidsmeldingen"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testmeldingen"</string>
 </resources>
diff --git a/res/values-mcc424-or/strings.xml b/res/values-mcc424-or/strings.xml
index f78b196..ed3790d 100644
--- a/res/values-mcc424-or/strings.xml
+++ b/res/values-mcc424-or/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ରାଷ୍ଟ୍ରୀୟ ଅପାତକାଳୀନ ଆଲର୍ଟ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"ଚେତାବନୀ ଆଲର୍ଟ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ଚେତାବନୀ ଆଲର୍ଟ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ପରୀକ୍ଷା ଆଲର୍ଟ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ଜାତୀୟ ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ଚେତାବନୀ ଆଲର୍ଟ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ଜନସାଧାରଣଙ୍କ ପାଇଁ ସୁରକ୍ଷା ଆଲର୍ଟ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ବ୍ୟାୟାମ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ଚେତାବନୀ ଆଲର୍ଟ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ଜନସାଧାରଣଙ୍କ ପାଇଁ ସୁରକ୍ଷା ଆଲର୍ଟ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ଟେଷ୍ଟ ଆଲର୍ଟ"</string>
 </resources>
diff --git a/res/values-mcc424-pa/strings.xml b/res/values-mcc424-pa/strings.xml
index 8f09806..77f60a2 100644
--- a/res/values-mcc424-pa/strings.xml
+++ b/res/values-mcc424-pa/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ਕੌਮੀ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ਟੈਸਟ ਸੁਚੇਤਨਾ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"ਜਾਂਚ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ਕੌਮੀ ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੁਚੇਤਨਾ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ਕਸਰਤ"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ਜਾਂਚ ਸੁਚੇਤਨਾ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ਜਾਂਚ ਸੁਚੇਤਨਾ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"ਚਿਤਾਵਨੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"ਜਨਤਕ ਸੁਰੱਖਿਆ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ਜਾਂਚ ਸੁਚੇਤਨਾਵਾਂ"</string>
 </resources>
diff --git a/res/values-mcc424-pl/strings.xml b/res/values-mcc424-pl/strings.xml
index beda397..33a57b6 100644
--- a/res/values-mcc424-pl/strings.xml
+++ b/res/values-mcc424-pl/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alert o zagrożeniu krajowym"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alerty z ostrzeżeniami"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alerty z ostrzeżeniami"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alert testowy"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alert testowy"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alert o zagrożeniu krajowym"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alert o zagrożeniu"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alert o zagrożeniu"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alert o zagrożeniu"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alert o zagrożeniu"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Ostrzeżenie"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alert dotyczący bezpieczeństwa publicznego"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Trening"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alert testowy"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alert testowy"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alerty z ostrzeżeniami"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alerty dotyczące bezpieczeństwa publicznego"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alerty testowe"</string>
 </resources>
diff --git a/res/values-mcc424-pt-rPT/strings.xml b/res/values-mcc424-pt-rPT/strings.xml
index b6ef9df..2da39a5 100644
--- a/res/values-mcc424-pt-rPT/strings.xml
+++ b/res/values-mcc424-pt-rPT/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergência nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alertas de aviso"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de aviso"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de teste"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alerta de teste"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta de emergência nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emergência"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emergência"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emergência"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emergência"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de aviso"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de segurança pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercício"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de teste"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de teste"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de aviso"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de segurança pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de teste"</string>
 </resources>
diff --git a/res/values-mcc424-pt/strings.xml b/res/values-mcc424-pt/strings.xml
index daae12c..84fc0b2 100644
--- a/res/values-mcc424-pt/strings.xml
+++ b/res/values-mcc424-pt/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerta de emergência nacional"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alertas de aviso"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alertas de aviso"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alerta de teste"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alerta de teste"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerta de emergência nacional"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alerta de emergência"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alerta de emergência"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alerta de emergência"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alerta de emergência"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alerta de aviso"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerta de segurança pública"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exercícios"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alerta de teste"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alerta de teste"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alertas de aviso"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alertas de segurança pública"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alertas de teste"</string>
 </resources>
diff --git a/res/values-mcc424-ro/strings.xml b/res/values-mcc424-ro/strings.xml
index d9fd2d2..5dc7936 100644
--- a/res/values-mcc424-ro/strings.xml
+++ b/res/values-mcc424-ro/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alertă națională de urgență"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Alerte de atenționare"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Alerte de atenționare"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Alertă de testare"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Alertă de testare"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alertă de urgență națională"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alertă de urgență"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alertă de urgență"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alertă de urgență"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alertă de urgență"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alertă de atenționare"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alertă publică privind siguranța"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Exerciții fizice"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Alertă de testare"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Alertă de testare"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Alerte de atenționare"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Alerte publice privind siguranța"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Alerte de testare"</string>
 </resources>
diff --git a/res/values-mcc424-ru/strings.xml b/res/values-mcc424-ru/strings.xml
index 56ba9db..28c94f6 100644
--- a/res/values-mcc424-ru/strings.xml
+++ b/res/values-mcc424-ru/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Федеральное экстренное оповещение"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Предупреждения"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Предупреждения"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестовое оповещение"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Тестовое оповещение"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Общенациональное экстренное оповещение"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Аварийное оповещение"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Аварийное оповещение"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Аварийное оповещение"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Аварийное оповещение"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Предупреждение"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Оповещение об угрозе общественной безопасности"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Упражнение"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Тестовое оповещение"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Тестовое оповещение"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Предупреждения"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Оповещения об угрозе общественной безопасности"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Тестовые оповещения"</string>
 </resources>
diff --git a/res/values-mcc424-si/strings.xml b/res/values-mcc424-si/strings.xml
index f7158bc..3dec842 100644
--- a/res/values-mcc424-si/strings.xml
+++ b/res/values-mcc424-si/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"ජාතික හදිසි අවස්ථා ඇඟවීම"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"අනතුරු ඇඟවීම්"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"අනතුරු ඇඟවීම්"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"පරීක්ෂණ ඇඟවීම"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"පරීක්ෂණ ඇඟවීම"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"ජාතික හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"හදිසි අවස්ථා ඇඟවීම"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"අනතුරු ඇඟවීම"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"පොදු ආරක්ෂාව පිළිබඳ ඇඟවීම"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ව්‍යායාමය"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"පරීක්ෂණ ඇඟවීම"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"පරීක්ෂණ ඇඟවීම"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"අනතුරු ඇඟවීම්"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"පොදු ආරක්ෂාව පිළිබඳ ඇඟවීම්"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"පරීක්ෂණ ඇඟවීම්"</string>
 </resources>
diff --git a/res/values-mcc424-sk/strings.xml b/res/values-mcc424-sk/strings.xml
index a5ebc0a..ba9f823 100644
--- a/res/values-mcc424-sk/strings.xml
+++ b/res/values-mcc424-sk/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Celoštátne núdzové varovanie"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Upozornenia"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Upozornenia"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testovacie varovanie"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testovacie varovanie"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Celoštátne tiesňové varovanie"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Tiesňové varovanie"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Tiesňové varovanie"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Tiesňové varovanie"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Tiesňové varovanie"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Upozornenie"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Varovanie verejnej bezpečnosti"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Cvičenie"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testovacie varovanie"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testovacie varovanie"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Upozornenia"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Varovania verejnej bezpečnosti"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testovacie varovania"</string>
 </resources>
diff --git a/res/values-mcc424-sl/strings.xml b/res/values-mcc424-sl/strings.xml
index 29b188b..f8a0bbf 100644
--- a/res/values-mcc424-sl/strings.xml
+++ b/res/values-mcc424-sl/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Državno opozorilo v sili"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Opozorila"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Opozorila"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Preskusno opozorilo"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Preizkusno opozorilo"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Državno opozorilo v sili"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Opozorilo v sili"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Opozorilo v sili"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Opozorilo v sili"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Opozorilo v sili"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Opozorilno obvestilo"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Opozorilo za javno varnost"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Vaja"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Preizkusno opozorilo"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Preizkusno opozorilo"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Opozorilna obvestila"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Opozorila za javno varnost"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Preizkusna opozorila"</string>
 </resources>
diff --git a/res/values-mcc424-sq/strings.xml b/res/values-mcc424-sq/strings.xml
index 95ab7fb..4e08dde 100644
--- a/res/values-mcc424-sq/strings.xml
+++ b/res/values-mcc424-sq/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Sinjalizim urgjence kombëtare"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Sinjalizimet paralajmëruese"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Sinjalizimet paralajmëruese"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Sinjalizim testimi"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Sinjalizim testimi"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Sinjalizim urgjence kombëtare"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Sinjalizim urgjence"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Sinjalizim urgjence"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Sinjalizim urgjence"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Sinjalizim urgjence"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Sinjalizim paralajmërues"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Sinjalizim i sigurisë publike"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Ushtrimi"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Sinjalizim testimi"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Sinjalizim testimi"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Sinjalizime paralajmëruese"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Sinjalizime të sigurisë publike"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Sinjalizime testimi"</string>
 </resources>
diff --git a/res/values-mcc424-sr/strings.xml b/res/values-mcc424-sr/strings.xml
index b54a3f8..e3017d5 100644
--- a/res/values-mcc424-sr/strings.xml
+++ b/res/values-mcc424-sr/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Обавештење о хитном случају на нивоу земље"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Обавештења о упозорењима"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Обавештења о упозорењима"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тест обавештење"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Пробно упозорење"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Обавештење о хитном случају на нивоу земље"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Обавештење о хитном случају"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Обавештење о хитном случају"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Обавештење о хитном случају"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Обавештење о хитном случају"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Обавештење о упозорењу"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Обавештење о јавној безбедности"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Вежбање"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Пробно обавештење"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Пробно обавештење"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Обавештења о упозорењима"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Обавештења о јавној безбедности"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Пробна обавештења"</string>
 </resources>
diff --git a/res/values-mcc424-sv/strings.xml b/res/values-mcc424-sv/strings.xml
index 5d33c81..3ee5656 100644
--- a/res/values-mcc424-sv/strings.xml
+++ b/res/values-mcc424-sv/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Varning om nationell nödsituation"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Varningsmeddelanden"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Varningsmeddelanden"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Testvarning"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Testvarning"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Varning om nationell nödsituation"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Varning om nödsituation"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Varning om nödsituation"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Varning om nödsituation"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Varning om nödsituation"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Varningsmeddelande"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Säkerhetsvarning till allmänheten"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Övning"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Testvarning"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Testvarning"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Varningsmeddelanden"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Säkerhetsvarningar till allmänheten"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Testvarningar"</string>
 </resources>
diff --git a/res/values-mcc424-sw/strings.xml b/res/values-mcc424-sw/strings.xml
index 63c5a49..90a36e2 100644
--- a/res/values-mcc424-sw/strings.xml
+++ b/res/values-mcc424-sw/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Tahadhari kuhusu dharura ya kitaifa"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Arifa za onyo"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Arifa za onyo"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Jaribio la tahadhari"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Ilani ya jaribio"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Tahadhari ya Dharura ya Kitaifa"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Tahadhari ya Dharura"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Tahadhari ya Dharura"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Tahadhari ya Dharura"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Tahadhari ya Dharura"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"TahadharI"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Tahadhari ya Usalama kwa Umma"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Mazoezi"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Tahadhari ya Jaribio"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Tahadhari ya Jaribio"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Tahadhari"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Tahadhari za Usalama kwa Umma"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Tahadhari za Majaribio"</string>
 </resources>
diff --git a/res/values-mcc424-ta/strings.xml b/res/values-mcc424-ta/strings.xml
index b8b96fb..ec3db25 100644
--- a/res/values-mcc424-ta/strings.xml
+++ b/res/values-mcc424-ta/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"தேசிய அளவிலான அவசரக்கால எச்சரிக்கை"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"எச்சரிக்கை விழிப்பூட்டல்கள்"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"எச்சரிக்கை விழிப்பூட்டல்கள்"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"சோதனை எச்சரிக்கை"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"சோதனை எச்சரிக்கை"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"தேசிய அளவிலான அவசரகால விழிப்பூட்டல்"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"அவசரகால விழிப்பூட்டல்"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"அவசரகால விழிப்பூட்டல்"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"அவசரகால விழிப்பூட்டல்"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"அவசரகால விழிப்பூட்டல்"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"எச்சரிக்கை விழிப்பூட்டல்"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"பொதுப் பாதுகாப்பு விழிப்பூட்டல்"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"உடற்பயிற்சி"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"சோதனை விழிப்பூட்டல்"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"சோதனை விழிப்பூட்டல்"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"எச்சரிக்கை விழிப்பூட்டல்கள்"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"பொதுப் பாதுகாப்பு விழிப்பூட்டல்கள்"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"சோதனை விழிப்பூட்டல்கள்"</string>
 </resources>
diff --git a/res/values-mcc424-te/strings.xml b/res/values-mcc424-te/strings.xml
index f43749d..4d5953f 100644
--- a/res/values-mcc424-te/strings.xml
+++ b/res/values-mcc424-te/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"జాతీయ అత్యవసర హెచ్చరిక"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"హెచ్చరిక అలర్ట్‌లు"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"హెచ్చరిక అలర్ట్‌లు"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"పరీక్ష హెచ్చరిక"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"పరీక్ష హెచ్చరిక"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"జాతీయ అత్యవసర అలర్ట్"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"అత్యవసర అలర్ట్"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"అత్యవసర అలర్ట్"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"అత్యవసర అలర్ట్"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"అత్యవసర అలర్ట్"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"హెచ్చరిక అలర్ట్"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"పబ్లిక్ భద్రత అలర్ట్"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"వ్యాయామం"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"పరీక్ష అలర్ట్"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"పరీక్ష అలర్ట్"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"హెచ్చరిక అలర్ట్‌లు"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"పబ్లిక్ భద్రత అలర్ట్‌లు"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"పరీక్ష అలర్ట్‌లు"</string>
 </resources>
diff --git a/res/values-mcc424-th/strings.xml b/res/values-mcc424-th/strings.xml
index fbd90ad..b413e3b 100644
--- a/res/values-mcc424-th/strings.xml
+++ b/res/values-mcc424-th/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"การแจ้งเหตุฉุกเฉินระดับชาติ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"การแจ้งเตือน"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"การแจ้งเตือน"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ทดสอบการแจ้งเหตุ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"ทดสอบการแจ้งเหตุ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"การแจ้งเตือนเหตุฉุกเฉินระดับชาติ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"การแจ้งเตือนภัย"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"การแจ้งเตือนด้านความปลอดภัยสาธารณะ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ออกกำลังกาย"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"การแจ้งเตือนการทดสอบ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"การแจ้งเตือนการทดสอบ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"การแจ้งเตือนภัย"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"การแจ้งเตือนด้านความปลอดภัยสาธารณะ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"การแจ้งเตือนการทดสอบ"</string>
 </resources>
diff --git a/res/values-mcc424-tl/strings.xml b/res/values-mcc424-tl/strings.xml
index b1ae6a0..747fc89 100644
--- a/res/values-mcc424-tl/strings.xml
+++ b/res/values-mcc424-tl/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Alerto para sa pambansang emergency"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Mga alertong babala"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Mga alertong babala"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Pansubok na alerto"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Pansubok na alerto"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Alerto para sa Pambansang Emergency"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Alertong Pang-emergency"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Alertong Pang-emergency"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Alertong Pang-emergency"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Alertong Pang-emergency"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Alertong Babala"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Alerto para sa Pampublikong Kaligtasan"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Mag-ehersisyo"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Pansubok na Alerto"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Pansubok na Alerto"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Mga Alertong Babala"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Mga Alerto para sa Pampublikong Kaligtasan"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Mga Pansubok na Alerto"</string>
 </resources>
diff --git a/res/values-mcc424-tr/strings.xml b/res/values-mcc424-tr/strings.xml
index 5bc6158..fa617ab 100644
--- a/res/values-mcc424-tr/strings.xml
+++ b/res/values-mcc424-tr/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Ulusal acil durum uyarısı"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Uyarı alarmları"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Uyarı alarmları"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Test amaçlı uyarı"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Test amaçlı uyarı"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Ulusal Düzeyde Acil Durum Uyarısı"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Acil Durum Uyarısı"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Acil Durum Uyarısı"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Acil Durum Uyarısı"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Acil Durum Uyarısı"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"İkaz Uyarısı"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Kamu Güvenliği Uyarısı"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Spor"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Test Amaçlı Uyarı"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Test Amaçlı Uyarı"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"İkaz Uyarıları"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Kamu Güvenliği Uyarıları"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Test Amaçlı Uyarılar"</string>
 </resources>
diff --git a/res/values-mcc424-uk/strings.xml b/res/values-mcc424-uk/strings.xml
index 276a26e..a195f5b 100644
--- a/res/values-mcc424-uk/strings.xml
+++ b/res/values-mcc424-uk/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Екстрене сповіщення для всієї країни"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Сповіщення з попередженнями"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Сповіщення з попередженнями"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Тестове сповіщення"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Тестове сповіщення"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Екстрене сповіщення для всієї країни"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Екстрене сповіщення"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Екстрене сповіщення"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Екстрене сповіщення"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Екстрене сповіщення"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Застереження"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Сповіщення щодо громадської безпеки"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Вправа"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Тестове сповіщення"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Тестове сповіщення"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Застереження"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Сповіщення щодо громадської безпеки"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Тестові сповіщення"</string>
 </resources>
diff --git a/res/values-mcc424-ur/strings.xml b/res/values-mcc424-ur/strings.xml
index c33754b..760bdb6 100644
--- a/res/values-mcc424-ur/strings.xml
+++ b/res/values-mcc424-ur/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"قومی ہنگامی الرٹ"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"انتباہی الرٹس"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"انتباہی الرٹس"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"ٹیسٹ الرٹ"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"ٹیسٹ الرٹ"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"قومی ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"ہنگامی الرٹ"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"ہنگامی الرٹ"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"ہنگامی الرٹ"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"وارننگ الرٹ"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"عوامی حفاظتی الرٹ"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"ورزش"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"ٹیسٹ الرٹ"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"ٹیسٹ الرٹ"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"وارننگ الرٹس"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"عوامی حفاظتی الرٹس"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"ٹیسٹ الرٹس"</string>
 </resources>
diff --git a/res/values-mcc424-uz/strings.xml b/res/values-mcc424-uz/strings.xml
index 434d537..5c9814e 100644
--- a/res/values-mcc424-uz/strings.xml
+++ b/res/values-mcc424-uz/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Milliy favqulodda ogohlantirish"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Ogohlantirishlar"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Ogohlantirishlar"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Sinov ogohlantirishi"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Sinov ogohlantirishi"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Milliy favqulodda ogohlantirish"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Favqulodda ogohlantirish"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Favqulodda ogohlantirish"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Favqulodda ogohlantirish"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Favqulodda ogohlantirish"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Ogohlantirish"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Ommaviy xavfsizlik haqida ogohlantirish"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Sinov"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Sinov ogohlantirishi"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Sinov ogohlantirishi"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Ogohlantirishlar"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Ommaviy xavfsizlik haqida ogohlantirishlar"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Sinov ogohlantirishlari"</string>
 </resources>
diff --git a/res/values-mcc424-vi/strings.xml b/res/values-mcc424-vi/strings.xml
index dfd1770..b6af09c 100644
--- a/res/values-mcc424-vi/strings.xml
+++ b/res/values-mcc424-vi/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Cảnh báo khẩn cấp của quốc gia"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Cảnh báo"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Cảnh báo"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Cảnh báo thử nghiệm"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Cảnh báo thử nghiệm"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Cảnh báo khẩn cấp của quốc gia"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Cảnh báo khẩn cấp"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Cảnh báo khẩn cấp"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Cảnh báo khẩn cấp"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Cảnh báo khẩn cấp"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Cảnh báo"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Cảnh báo chung về an toàn"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Tập thể dục"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Cảnh báo thử nghiệm"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Cảnh báo thử nghiệm"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Cảnh báo"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Cảnh báo chung về an toàn"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Cảnh báo thử nghiệm"</string>
 </resources>
diff --git a/res/values-mcc424-zh-rCN/strings.xml b/res/values-mcc424-zh-rCN/strings.xml
index 9e50ca5..148e55a 100644
--- a/res/values-mcc424-zh-rCN/strings.xml
+++ b/res/values-mcc424-zh-rCN/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"国家紧急警报"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"警报"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"警报"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"测试警报"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"测试警报"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"国家紧急警示"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"紧急警示"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"紧急警示"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"紧急警示"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"紧急警示"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"警示"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"公共安全警示"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"锻炼"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"测试警示"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"测试警示"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"警示"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"公共安全警示"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"测试警示"</string>
 </resources>
diff --git a/res/values-mcc424-zh-rHK/strings.xml b/res/values-mcc424-zh-rHK/strings.xml
index 6d1d068..b4e27c1 100644
--- a/res/values-mcc424-zh-rHK/strings.xml
+++ b/res/values-mcc424-zh-rHK/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"國家/地區緊急警示"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"警示"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"警示"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"測試警示"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"測試警示"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"國家/地區緊急警示"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"緊急警示"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"緊急警示"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"緊急警示"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"緊急警示"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"警示"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"公共安全警示"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"運動"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"測試警示"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"測試警示"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"警示"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"公共安全警示"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"測試警示"</string>
 </resources>
diff --git a/res/values-mcc424-zh-rTW/strings.xml b/res/values-mcc424-zh-rTW/strings.xml
index 06d1db5..b4e27c1 100644
--- a/res/values-mcc424-zh-rTW/strings.xml
+++ b/res/values-mcc424-zh-rTW/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"國家/地區緊急警報"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"警示快訊"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"警示快訊"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"測試警報"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"測試警報"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"國家/地區緊急警示"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"緊急警示"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"緊急警示"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"緊急警示"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"緊急警示"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"警示"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"公共安全警示"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"運動"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"測試警示"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"測試警示"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"警示"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"公共安全警示"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"測試警示"</string>
 </resources>
diff --git a/res/values-mcc424-zu/strings.xml b/res/values-mcc424-zu/strings.xml
index 1ec050a..37f73a9 100644
--- a/res/values-mcc424-zu/strings.xml
+++ b/res/values-mcc424-zu/strings.xml
@@ -16,10 +16,17 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="175237477015066795">"Isaziso esiphuthumayo sikazwelonke"</string>
-    <string name="pws_other_message_identifiers" msgid="1160028649251004769">"Izexwayiso"</string>
-    <string name="enable_emergency_alerts_message_title" msgid="876981179796412627">"Izexwayiso"</string>
-    <string name="cmas_required_monthly_test" msgid="7606843318721168353">"Isixwayiso sokuhlola"</string>
-    <string name="public_safety_message" msgid="2643362135123023300">"Isixwayiso sokuhlola"</string>
+    <string name="cmas_presidential_level_alert" msgid="569470769079166304">"Isexwayiso Esiphuthumayo Sikazwelonke"</string>
+    <string name="cmas_extreme_alert" msgid="9135130008703049274">"Isexwayiso Esiphuthumayo"</string>
+    <string name="cmas_extreme_immediate_observed_alert" msgid="713620529362685655">"Isexwayiso Esiphuthumayo"</string>
+    <string name="cmas_extreme_immediate_likely_alert" msgid="6858545279275537101">"Isexwayiso Esiphuthumayo"</string>
+    <string name="cmas_severe_alert" msgid="6255792641522355328">"Isexwayiso Esiphuthumayo"</string>
+    <string name="pws_other_message_identifiers" msgid="2219849459734958071">"Isexwayiso Sokuxwayisa"</string>
+    <string name="public_safety_message" msgid="6430821308078207535">"Isexwayiso Sokuphepha Esidlangalaleni"</string>
     <string name="cmas_exercise_alert" msgid="5775307523978007483">"Ukuzivocavoca"</string>
+    <string name="cmas_required_monthly_test" msgid="638043663020315444">"Isexwayiso Sokuhlola"</string>
+    <string name="state_local_test_alert" msgid="5347253401221487116">"Isexwayiso Sokuhlola"</string>
+    <string name="enable_emergency_alerts_message_title" msgid="5365080705719184919">"Izexwayiso Zokuxwayisa"</string>
+    <string name="enable_public_safety_messages_title" msgid="4702006823902961758">"Izexwayiso Zokuphepha Esidlangalaleni"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="3586102183699625309">"Izexwayiso Zokuhlola"</string>
 </resources>
diff --git a/res/values-mcc424/config.xml b/res/values-mcc424/config.xml
index acf794b..9f76b55 100644
--- a/res/values-mcc424/config.xml
+++ b/res/values-mcc424/config.xml
@@ -21,13 +21,15 @@
     <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>
 
     <!-- Hide state local test from menu, but still enable it -->
     <bool name="show_state_local_test_settings">false</bool>
     <bool name="state_local_test_alerts_enabled_default">true</bool>
 
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">true</bool>
+    <bool name="override_dnd">true</bool>
     <!-- 4379, 4392 -->
     <string-array name="emergency_alerts_channels_range_strings" translatable="false">
         <item>0x111B:rat=gsm, emergency=true</item>
@@ -45,14 +47,14 @@
         <!-- Public safety messages -->
         <item>0x112C:rat=gsm, type=info, emergency=true</item>
         <!-- Public safety messages for additional language -->
-        <item>0x112D:rat=gsm, type=info, emergency=true, filter_language=true</item>
+        <item>0x112D:rat=gsm, type=info, emergency=true</item>
     </string-array>
     <!-- 4398, 4399 -->
     <string-array name="state_local_test_alert_range_strings" translatable="false">
         <!-- state/local test -->
-        <item>0x112E:rat=gsm, type=info, emergency=true</item>
+        <item>0x112E:rat=gsm, type=info, emergency=true, testing_mode=true</item>
         <!-- state/local test additional language -->
-        <item>0x112F:rat=gsm, type=info, emergency=true, filter_language=true</item>
+        <item>0x112F:rat=gsm, type=info, emergency=true, testing_mode=true</item>
     </string-array>
     <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false">
     </string-array>
@@ -60,7 +62,16 @@
     </string-array>
     <!-- Whether to always receive exercise alerts regardless of test alerts toggle state -->
     <!-- By default it's true for United Arab Emirates users -->
-    <bool name="always_enable_exercise_alert">true</bool>
+    <!-- 4381, 4394 -->
+    <string-array name="exercise_alert_range_strings" translatable="false">
+        <item>0x111D:rat=gsm, emergency=true, always_on=true</item>
+        <!-- additional language -->
+        <item>0x112A:rat=gsm, emergency=true, always_on=true</item>
+    </string-array>
     <!-- Whether enabling copy message text into clipboard by long press -->
     <bool name="enable_text_copy">false</bool>
+    <!-- Text links generating method. does not allow text to be copied. so we can't use smart linkify. -->
+    <string name="link_method" translatable="false">legacy_linkify</string>
+    <!-- Whether to override the language of the alert dialog's title to match the message locale -->
+    <bool name="override_alert_title_language_to_match_message_locale">true</bool>
 </resources>
diff --git a/res/values-mcc425-mn/strings.xml b/res/values-mcc425-mn/strings.xml
index cd4d3b8..04b6df4 100644
--- a/res/values-mcc425-mn/strings.xml
+++ b/res/values-mcc425-mn/strings.xml
@@ -17,9 +17,9 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_severe_alert" msgid="4470698515511189493">"Анхааруулах сэрэмжлүүлэг"</string>
-    <string name="public_safety_message" msgid="7373019453807671797">"Мэдээллийн зурвас"</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_public_safety_messages_title" msgid="6173886162636474286">"Мэдээллийн зурвас"</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 c428d8e..a8b1b4e 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-mcc440-mnc11/config.xml b/res/values-mcc440-mnc11/config.xml
index b49083c..75d4b49 100644
--- a/res/values-mcc440-mnc11/config.xml
+++ b/res/values-mcc440-mnc11/config.xml
@@ -25,7 +25,7 @@
         <!-- 0x1104 for other disasters -->
         <item>0x1104:rat=gsm, type=other, emergency=true</item>
         <!-- 0xA808 for other purposes -->
-        <item>0xA808:rat=gsm, type=other, emergency=true, scope=carrier</item>
+        <item>0xA808:rat=gsm, type=other, emergency=true</item>
     </string-array>
     <string-array name="additional_cbs_channels_strings" translatable="false">
         <item>0xA807:rat=gsm, emergency=false</item>
diff --git a/res/values-mcc450-af/strings.xml b/res/values-mcc450-af/strings.xml
index 3d9a1d9..90704ec 100644
--- a/res/values-mcc450-af/strings.xml
+++ b/res/values-mcc450-af/strings.xml
@@ -17,4 +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">"Kritieke noodberig"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Jou foon kan vir jou waarskuwings, soos ontruiminginstruksies, stuur gedurende natuurlike rampe. Hierdie diens is \'n medewerking tussen die Nasionale Noodbestuuragentskap, netwerkverskaffers en toestelvervaardigers.\n\nJy sal dalk nie waarskuwings ontvang as daar \'n probleem met jou toestel is of as netwerkomstandighede swak is nie."</string>
 </resources>
diff --git a/res/values-mcc450-am/strings.xml b/res/values-mcc450-am/strings.xml
index e55e9c8..c702b8b 100644
--- a/res/values-mcc450-am/strings.xml
+++ b/res/values-mcc450-am/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-ar/strings.xml b/res/values-mcc450-ar/strings.xml
index 2196952..141d5d9 100644
--- a/res/values-mcc450-ar/strings.xml
+++ b/res/values-mcc450-ar/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-as/strings.xml b/res/values-mcc450-as/strings.xml
index 087a7f1..3559406 100644
--- a/res/values-mcc450-as/strings.xml
+++ b/res/values-mcc450-as/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-az/strings.xml b/res/values-mcc450-az/strings.xml
index 904532d..4b569a2 100644
--- a/res/values-mcc450-az/strings.xml
+++ b/res/values-mcc450-az/strings.xml
@@ -17,4 +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">"Mühüm təcili siqnal"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefonunuz təbii fəlakətlər zamanı evakuasiya təlimatları kimi xəbərdarlıqlar göndərə bilər. Bu xidmət Milli Fövqəladə Hallara Nəzarət İdarəsi, şəbəkə provayderləri və cihaz istehsalçıları arasında əməkdaşlıq şəklində təmin edilir.\n\nCihazda və ya şəbəkədə problem olduqda xəbərdarlıq almaya bilərsiniz."</string>
 </resources>
diff --git a/res/values-mcc450-b+sr+Latn/strings.xml b/res/values-mcc450-b+sr+Latn/strings.xml
index c0527e5..a0a861d 100644
--- a/res/values-mcc450-b+sr+Latn/strings.xml
+++ b/res/values-mcc450-b+sr+Latn/strings.xml
@@ -17,4 +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">"Obaveštenje o kritičnom hitnom slučaju"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefon može da vam šalje upozorenja, poput uputstva za evakuaciju, tokom prirodnih katastrofa. Ova usluga predstavlja saradnju između Nacionalne agencije za upravljanje hitnim slučajevima, mrežnih operatera i proizvođača uređaja.\n\nMožda nećete dobijati upozorenja ako dođe do problema sa uređajem ili ako mreža nije dovoljno jaka."</string>
 </resources>
diff --git a/res/values-mcc450-be/strings.xml b/res/values-mcc450-be/strings.xml
index cb37386..f7580ce 100644
--- a/res/values-mcc450-be/strings.xml
+++ b/res/values-mcc450-be/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-bg/strings.xml b/res/values-mcc450-bg/strings.xml
index 866e958..b862923 100644
--- a/res/values-mcc450-bg/strings.xml
+++ b/res/values-mcc450-bg/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-bn/strings.xml b/res/values-mcc450-bn/strings.xml
index 2caffa3..152d080 100644
--- a/res/values-mcc450-bn/strings.xml
+++ b/res/values-mcc450-bn/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-bs/strings.xml b/res/values-mcc450-bs/strings.xml
index 2cf6d8f..529c00f 100644
--- a/res/values-mcc450-bs/strings.xml
+++ b/res/values-mcc450-bs/strings.xml
@@ -17,4 +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">"Kritično upozorenje za hitan slučaj"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefon vam može slati obavještenja, kao što su upute za evakuaciju, tokom prirodnih katastrofa. Ova usluga predstavlja saradnju između Nacionalne agencije za upravljanje vanrednim situacijama, mobilnih operatera i proizvođača uređaja.\n\nMožda nećete primati obavještenja ako postoji problem s vašim uređajem ili ako je stanje mreže loše."</string>
 </resources>
diff --git a/res/values-mcc450-ca/strings.xml b/res/values-mcc450-ca/strings.xml
index 2e069c9..7705a7b 100644
--- a/res/values-mcc450-ca/strings.xml
+++ b/res/values-mcc450-ca/strings.xml
@@ -17,4 +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">"Alerta d\'emergència crítica"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"El telèfon et pot enviar alertes, com ara instruccions d\'evacuació, durant els desastres naturals. Aquest servei és una col·laboració entre l\'agència nacional de gestió d\'emergències de Corea del Sud, els proveïdors de xarxa i els fabricants de dispositius.\n\nÉs possible que no rebis alertes si hi ha un problema al teu dispositiu o si l\'estat de la xarxa és deficient."</string>
 </resources>
diff --git a/res/values-mcc450-cs/strings.xml b/res/values-mcc450-cs/strings.xml
index f3fef64..5e67b0c 100644
--- a/res/values-mcc450-cs/strings.xml
+++ b/res/values-mcc450-cs/strings.xml
@@ -16,5 +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">"Kritická nouzová výstraha"</string>
+    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Kritická výstražná zpráva"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefon vám bude při přírodních katastrofách odesílat upozornění, např. pokyny k evakuaci. Tato služba vznikla ve spolupráci mezi Národním úřadem pro krizové situace, poskytovateli sítí a výrobci zařízení.\n\nPokud dojde k problému se zařízením nebo bude špatné připojení, upozornění nemusíte dostat."</string>
 </resources>
diff --git a/res/values-mcc450-da/strings.xml b/res/values-mcc450-da/strings.xml
index 31716c7..98ad59a 100644
--- a/res/values-mcc450-da/strings.xml
+++ b/res/values-mcc450-da/strings.xml
@@ -17,4 +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">"Kritisk nødalarm"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Din telefon kan sende dig varsler, f.eks. vejledning i evakuering i forbindelse med naturkatastrofer. Denne tjeneste er et samarbejde mellem den nationale beredskabsstyrelse i Sydkorea, netværksudbydere og enhedsproducenter.\n\nDu modtager muligvis ikke varsler, hvis der er et problem med din enhed, eller hvis dine netværksforhold er dårlige."</string>
 </resources>
diff --git a/res/values-mcc450-de/strings.xml b/res/values-mcc450-de/strings.xml
index 9f9c4bf..f575742 100644
--- a/res/values-mcc450-de/strings.xml
+++ b/res/values-mcc450-de/strings.xml
@@ -17,4 +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">"Kritische Notfallbenachrichtigung"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Dein Smartphone kann dir bei Naturkatastrophen Warnungen senden, zum Beispiel Evakuierungsanweisungen. Dieser Dienst ist ein gemeinsames Angebot der National Emergency Management Agency mit Netzwerkanbietern und Geräteherstellern.\n\nBei einem Problem mit deinem Gerät oder schlechten Netzwerkbedingungen kannst du eventuell keine Warnungen empfangen."</string>
 </resources>
diff --git a/res/values-mcc450-el/strings.xml b/res/values-mcc450-el/strings.xml
index f1bca04..d9bb9a9 100644
--- a/res/values-mcc450-el/strings.xml
+++ b/res/values-mcc450-el/strings.xml
@@ -17,4 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Σημαντική ειδοποίηση έκτακτης ανάγκης"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Το τηλέφωνό σας μπορεί να σας στείλει ειδοποιήσεις, όπως οδηγίες εκκένωσης κατά τη διάρκεια φυσικών καταστροφών. Αυτή η υπηρεσία είναι μια συνεργασία μεταξύ της υπηρεσίας National Emergency Management Agency, παρόχων δικτύου και κατασκευαστών συσκευών.\n\nΕνδέχεται να μην λαμβάνετε ειδοποιήσεις εάν υπάρχει πρόβλημα με τη συσκευή σας ή αν δεν είναι καλές οι συνθήκες του δικτύου."</string>
 </resources>
diff --git a/res/values-mcc450-en-rAU/strings.xml b/res/values-mcc450-en-rAU/strings.xml
index 369554d..66b4895 100644
--- a/res/values-mcc450-en-rAU/strings.xml
+++ b/res/values-mcc450-en-rAU/strings.xml
@@ -17,4 +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">"Critical emergency alert"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Your phone can send you alerts, like evacuation instructions, during natural disasters. This service is a collaboration between the National Emergency Management Agency, network providers and device manufacturers.\n\nYou may not get alerts if there’s a problem with your device or if network conditions are poor."</string>
 </resources>
diff --git a/res/values-mcc450-en-rCA/strings.xml b/res/values-mcc450-en-rCA/strings.xml
index 369554d..66b4895 100644
--- a/res/values-mcc450-en-rCA/strings.xml
+++ b/res/values-mcc450-en-rCA/strings.xml
@@ -17,4 +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">"Critical emergency alert"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Your phone can send you alerts, like evacuation instructions, during natural disasters. This service is a collaboration between the National Emergency Management Agency, network providers and device manufacturers.\n\nYou may not get alerts if there’s a problem with your device or if network conditions are poor."</string>
 </resources>
diff --git a/res/values-mcc450-en-rGB/strings.xml b/res/values-mcc450-en-rGB/strings.xml
index 369554d..66b4895 100644
--- a/res/values-mcc450-en-rGB/strings.xml
+++ b/res/values-mcc450-en-rGB/strings.xml
@@ -17,4 +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">"Critical emergency alert"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Your phone can send you alerts, like evacuation instructions, during natural disasters. This service is a collaboration between the National Emergency Management Agency, network providers and device manufacturers.\n\nYou may not get alerts if there’s a problem with your device or if network conditions are poor."</string>
 </resources>
diff --git a/res/values-mcc450-en-rIN/strings.xml b/res/values-mcc450-en-rIN/strings.xml
index 369554d..66b4895 100644
--- a/res/values-mcc450-en-rIN/strings.xml
+++ b/res/values-mcc450-en-rIN/strings.xml
@@ -17,4 +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">"Critical emergency alert"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Your phone can send you alerts, like evacuation instructions, during natural disasters. This service is a collaboration between the National Emergency Management Agency, network providers and device manufacturers.\n\nYou may not get alerts if there’s a problem with your device or if network conditions are poor."</string>
 </resources>
diff --git a/res/values-mcc450-en-rXC/strings.xml b/res/values-mcc450-en-rXC/strings.xml
index 8cc1db7..cf8719b 100644
--- a/res/values-mcc450-en-rXC/strings.xml
+++ b/res/values-mcc450-en-rXC/strings.xml
@@ -17,4 +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">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎Critical emergency alert‎‏‎‎‏‎"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎Your phone can send you alerts, like evacuation instructions, during natural disasters. This service is a collaboration between the National Emergency Management Agency, network providers, and device manufacturers.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You may not get alerts if there’s a problem with your device or if network conditions are poor.‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-mcc450-es-rUS/strings.xml b/res/values-mcc450-es-rUS/strings.xml
index d05eb73..aedadb2 100644
--- a/res/values-mcc450-es-rUS/strings.xml
+++ b/res/values-mcc450-es-rUS/strings.xml
@@ -17,4 +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">"Alerta de emergencia crítica"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"El teléfono puede enviarte alertas, como instrucciones de evacuación, durante desastres naturales. Este servicio es una colaboración entre la Agencia Nacional de Administración de Emergencias (National Emergency Management Agency), los proveedores de red y los fabricantes de dispositivos.\n\nEs posible que no recibas alertas si hay un problema con el dispositivo o si la conexión de red no es buena."</string>
 </resources>
diff --git a/res/values-mcc450-es/strings.xml b/res/values-mcc450-es/strings.xml
index 575820f..412a1a1 100644
--- a/res/values-mcc450-es/strings.xml
+++ b/res/values-mcc450-es/strings.xml
@@ -17,4 +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">"Alerta de emergencia importante"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Tu teléfono puede enviarte alertas, como instrucciones de evacuación, durante desastres naturales. Este servicio es una colaboración entre la organización National Emergency Management Agency, proveedores de red y fabricantes de dispositivos.\n\nEs posible que no recibas alertas si hay un problema con tu dispositivo o si las condiciones de la red son deficientes."</string>
 </resources>
diff --git a/res/values-mcc450-et/strings.xml b/res/values-mcc450-et/strings.xml
index d814dc5..d798327 100644
--- a/res/values-mcc450-et/strings.xml
+++ b/res/values-mcc450-et/strings.xml
@@ -17,4 +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">"Kriitilise tähtsusega hädaolukorra märguanne"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Teie telefon saab looduskatastroofide ajal teile hoiatusi (nt evakueerumisjuhiseid) saata. Seda teenust pakutakse koostöös organisatsiooniga National Emergency Management Agency, võrguteenuse pakkujatega ja seadmete tootjatega.\n\nKui teie seadmega on probleeme või võrgutingimused on kehvad, siis ei pruugi te hoiatusi saada."</string>
 </resources>
diff --git a/res/values-mcc450-eu/strings.xml b/res/values-mcc450-eu/strings.xml
index 5a3e6e1..278deb8 100644
--- a/res/values-mcc450-eu/strings.xml
+++ b/res/values-mcc450-eu/strings.xml
@@ -17,4 +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">"Ezinbesteko larrialdi-alerta"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefonoak alertak bidal diezazkizuke (adibidez, ebakuatzeko argibideak) hondamendi naturaletan. Larrialdiak kudeatzeko agentzia nazionalaren, sare-hornitzaileen eta gailu-fabrikatzaileen arteko elkarlana da zerbitzua.\n\nAgian ez duzu jasoko alertarik gailuak arazoren bat badu edo sarearen baldintzak txarrak badira."</string>
 </resources>
diff --git a/res/values-mcc450-fa/strings.xml b/res/values-mcc450-fa/strings.xml
index 3cac02e..660caeb 100644
--- a/res/values-mcc450-fa/strings.xml
+++ b/res/values-mcc450-fa/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-fi/strings.xml b/res/values-mcc450-fi/strings.xml
index 8aa1dc9..d86a117 100644
--- a/res/values-mcc450-fi/strings.xml
+++ b/res/values-mcc450-fi/strings.xml
@@ -16,5 +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">"Kriittinen hätätilannevaroitus"</string>
+    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"Kriittinen vaaratiedote"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Puhelimesi voi lähettää sinulle luonnonkatastrofien aikana ilmoituksia, esim. evakuointiohjeita. Palvelun tarjoavat yhteistyössä National Emergency Management Agency, verkko-operaattorit ja laitevalmistajat.\n\nEt välttämättä saa ilmoituksia, jos laitteessa on ongelma tai verkkoyhteys on heikko."</string>
 </resources>
diff --git a/res/values-mcc450-fr-rCA/strings.xml b/res/values-mcc450-fr-rCA/strings.xml
index 11eeac5..5c61c9f 100644
--- a/res/values-mcc450-fr-rCA/strings.xml
+++ b/res/values-mcc450-fr-rCA/strings.xml
@@ -17,4 +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">"Alerte d\'urgence critique"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Votre téléphone peut vous envoyer des alertes, comme des instructions d\'évacuation, lors de catastrophes naturelles. Ce service est le résultat d\'une collaboration entre l\'agence nationale de gestion des urgences, les fournisseurs de services réseau et les fabricants d\'appareils.\n\nVous pourriez ne pas recevoir d\'alertes en cas de problème avec votre appareil ou si les conditions du réseau ne sont pas optimales."</string>
 </resources>
diff --git a/res/values-mcc450-fr/strings.xml b/res/values-mcc450-fr/strings.xml
index 11eeac5..317f735 100644
--- a/res/values-mcc450-fr/strings.xml
+++ b/res/values-mcc450-fr/strings.xml
@@ -17,4 +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">"Alerte d\'urgence critique"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"En cas de catastrophe naturelle, votre téléphone peut vous envoyer des alertes, comme des instructions d\'évacuation. Ce service est le fruit d\'une collaboration entre la National Emergency Management Agency, les fournisseurs de réseau et les fabricants d\'appareils.\n\nS\'il y a un problème avec votre appareil ou si la connexion réseau n\'est pas bonne, vous risquez de ne pas recevoir les alertes."</string>
 </resources>
diff --git a/res/values-mcc450-gl/strings.xml b/res/values-mcc450-gl/strings.xml
index dae1c91..0740449 100644
--- a/res/values-mcc450-gl/strings.xml
+++ b/res/values-mcc450-gl/strings.xml
@@ -17,4 +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">"Alerta de emerxencia crítica"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"O teu teléfono pode enviarche alertas, como instrucións de evacuación, en caso de que se produza un desastre natural. Este servizo é unha colaboración entre o Departamento de Xestión de Emerxencias Nacionais de Corea do Sur, os provedores de rede e os fabricantes de dispositivos.\n\nÉ posible que non recibas ningunha alerta se o teu dispositivo ten algún problema ou se a conexión á rede é deficiente."</string>
 </resources>
diff --git a/res/values-mcc450-gu/strings.xml b/res/values-mcc450-gu/strings.xml
index 71e0c17..9eb3d7e 100644
--- a/res/values-mcc450-gu/strings.xml
+++ b/res/values-mcc450-gu/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-hi/strings.xml b/res/values-mcc450-hi/strings.xml
index d436c54..8e3acbc 100644
--- a/res/values-mcc450-hi/strings.xml
+++ b/res/values-mcc450-hi/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-hr/strings.xml b/res/values-mcc450-hr/strings.xml
index 982436d..7168de9 100644
--- a/res/values-mcc450-hr/strings.xml
+++ b/res/values-mcc450-hr/strings.xml
@@ -17,4 +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">"Kritično hitno upozorenje"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefon vam može slati upozorenja, poput uputa za evakuaciju, tijekom prirodnih katastrofa. Ta je usluga rezultat suradnje Nacionalne agencije za upravljanje u hitnim situacijama, mrežnih operatera i proizvođača uređaja.\n\nAko postoji problem s vašim uređajem ili su mrežni uvjeti loši, možda nećete primiti obavijesti."</string>
 </resources>
diff --git a/res/values-mcc450-hu/strings.xml b/res/values-mcc450-hu/strings.xml
index 8551b79..279c43d 100644
--- a/res/values-mcc450-hu/strings.xml
+++ b/res/values-mcc450-hu/strings.xml
@@ -17,4 +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">"Kritikus vészjelzés"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Az esetleges természeti katasztrófák során telefonja fontos értesítéseket, például evakuációs utasításokat küldhet Önnek. Ez a szolgáltatás a National Emergency Management Agency, a mobilhálózati szolgáltatók és az eszközgyártók összefogásával működik.\n\nAz eszközzel kapcsolatos problémák és a gyenge hálózati viszonyok megakadályozhatják az értesítések fogadását."</string>
 </resources>
diff --git a/res/values-mcc450-hy/strings.xml b/res/values-mcc450-hy/strings.xml
index eb79502..28ae9d7 100644
--- a/res/values-mcc450-hy/strings.xml
+++ b/res/values-mcc450-hy/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-in/strings.xml b/res/values-mcc450-in/strings.xml
index 749646f..3c7e2d6 100644
--- a/res/values-mcc450-in/strings.xml
+++ b/res/values-mcc450-in/strings.xml
@@ -17,4 +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">"Peringatan darurat kritis"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Ponsel dapat menerima peringatan, seperti petunjuk evakuasi, selama bencana alam. Layanan ini adalah kolaborasi antara National Emergency Management Agency (Badan Nasional Penanggulangan Bencana), penyedia jaringan, dan produsen perangkat.\n\nAnda mungkin tidak akan menerima peringatan jika perangkat bermasalah atau kondisi jaringan buruk."</string>
 </resources>
diff --git a/res/values-mcc450-is/strings.xml b/res/values-mcc450-is/strings.xml
index 5b1ac21..c8652c0 100644
--- a/res/values-mcc450-is/strings.xml
+++ b/res/values-mcc450-is/strings.xml
@@ -17,4 +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">"Áríðandi neyðarviðvörun"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Síminn þinn getur sent þér viðvaranir á borð við leiðbeiningar þegar rýma þarf stað vegna náttúruhamfara. Þjónustan er samstarfsverkefni hamfarastofnunarinnar, símafyrirtækja og tækjaframleiðenda.\n\nEkki er víst að þú fáir viðvaranir ef það er vandamál með tækið eða ef tengingar eru slæmar."</string>
 </resources>
diff --git a/res/values-mcc450-it/strings.xml b/res/values-mcc450-it/strings.xml
index 7d557f0..263083f 100644
--- a/res/values-mcc450-it/strings.xml
+++ b/res/values-mcc450-it/strings.xml
@@ -17,4 +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">"Avviso 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 1a3f9e1..a6b6049 100644
--- a/res/values-mcc450-iw/strings.xml
+++ b/res/values-mcc450-iw/strings.xml
@@ -16,5 +16,6 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"התרעה על מקרה חירום קריטי"</string>
+    <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"התראה על מקרה חירום קריטי"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"במהלך אסונות טבע, הטלפון יכול לשלוח התראות. למשל, הוראות לפינוי. השירות נוצר מתוך שיתוף פעולה בין הסוכנות הלאומית לניהול חירום, ספקי רשתות ויצרני מכשירים.\n\nייתכן שלא יוצגו לך התראות אם יש בעיה במכשיר או בעיות באיכות הרשת."</string>
 </resources>
diff --git a/res/values-mcc450-ja/strings.xml b/res/values-mcc450-ja/strings.xml
index 55e5836..3a56686 100644
--- a/res/values-mcc450-ja/strings.xml
+++ b/res/values-mcc450-ja/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-ka/strings.xml b/res/values-mcc450-ka/strings.xml
index e95c3c1..c37f861 100644
--- a/res/values-mcc450-ka/strings.xml
+++ b/res/values-mcc450-ka/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-kk/strings.xml b/res/values-mcc450-kk/strings.xml
index 228cdce..cc92537 100644
--- a/res/values-mcc450-kk/strings.xml
+++ b/res/values-mcc450-kk/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-km/strings.xml b/res/values-mcc450-km/strings.xml
index 2539430..2a009bf 100644
--- a/res/values-mcc450-km/strings.xml
+++ b/res/values-mcc450-km/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-kn/strings.xml b/res/values-mcc450-kn/strings.xml
index f498cd2..3075841 100644
--- a/res/values-mcc450-kn/strings.xml
+++ b/res/values-mcc450-kn/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-ko/strings.xml b/res/values-mcc450-ko/strings.xml
index 0e935e6..52f8752 100644
--- a/res/values-mcc450-ko/strings.xml
+++ b/res/values-mcc450-ko/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-ky/strings.xml b/res/values-mcc450-ky/strings.xml
index fe1d7af..7e2ec09 100644
--- a/res/values-mcc450-ky/strings.xml
+++ b/res/values-mcc450-ky/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-lo/strings.xml b/res/values-mcc450-lo/strings.xml
index fbacef6..97bd271 100644
--- a/res/values-mcc450-lo/strings.xml
+++ b/res/values-mcc450-lo/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-lt/strings.xml b/res/values-mcc450-lt/strings.xml
index 48b8e9d..019ee6f 100644
--- a/res/values-mcc450-lt/strings.xml
+++ b/res/values-mcc450-lt/strings.xml
@@ -17,4 +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">"Kritinis nepaprastosios padėties įspėjimas"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefonas gali siųsti jums įspėjimus, pvz., evakuacijos instrukcijas, įvykus stichinei nelaimei. Ši paslauga teikiama bendradarbiaujant valstybės ekstremaliųjų situacijų valdymo agentūrai, tinklo teikėjams ir įrenginių gamintojams.\n\nGalite negauti įspėjimų, jei iškilo įrenginio problema arba prastas tinklo ryšys."</string>
 </resources>
diff --git a/res/values-mcc450-lv/strings.xml b/res/values-mcc450-lv/strings.xml
index 9af759e..6fc86d0 100644
--- a/res/values-mcc450-lv/strings.xml
+++ b/res/values-mcc450-lv/strings.xml
@@ -17,4 +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">"Kritiskas ārkārtas situācijas brīdinājums"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Dabas katastrofu laikā varat tālrunī saņemt brīdinājumus, piemēram, evakuācijas norādījumus. Šo pakalpojumu nodrošina Dienvidkorejas Nacionālā ārkārtas situāciju pārvaldības aģentūra (National Emergency Management Agency) sadarbībā ar tīkla pakalpojumu sniedzējiem un ierīču ražotājiem.\n\nIespējams, nesaņemsiet brīdinājumus, ja kaut kas nebūs kārtībā ar ierīci vai tīkla apstākļi būs slikti."</string>
 </resources>
diff --git a/res/values-mcc450-mk/strings.xml b/res/values-mcc450-mk/strings.xml
index 196b112..40af743 100644
--- a/res/values-mcc450-mk/strings.xml
+++ b/res/values-mcc450-mk/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-ml/strings.xml b/res/values-mcc450-ml/strings.xml
index 3986d12..a62f235 100644
--- a/res/values-mcc450-ml/strings.xml
+++ b/res/values-mcc450-ml/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-mn/strings.xml b/res/values-mcc450-mn/strings.xml
index b1caff8..acf0eab 100644
--- a/res/values-mcc450-mn/strings.xml
+++ b/res/values-mcc450-mn/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-mnc05/config.xml b/res/values-mcc450-mnc05/config.xml
new file mode 100644
index 0000000..745dcdf
--- /dev/null
+++ b/res/values-mcc450-mnc05/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+  <!-- 4370, 4383, 40960(0xA000 test-mode) -->
+  <!-- Emergency alert tone duration set to 1 minute for Korean users -->
+  <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
+    <item>0x1112:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
+    <item>0x111F:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
+    <item>0xA000:rat=gsm, emergency=true, override_dnd=true, testing_mode=true</item>
+  </string-array>
+  <!-- 4371, 4384, 40961(0xA001 test mode) -->
+  <string-array name="emergency_alerts_channels_range_strings" translatable="false">
+    <item>0x1113:rat=gsm, emergency=true, override_dnd=true</item>
+    <item>0x1120:rat=gsm, emergency=true, override_dnd=true</item>
+    <item>0xA001:rat=gsm, emergency=true, override_dnd=true, testing_mode=true</item>
+  </string-array>
+  <!-- 4372, 4385, 4373~4379 Class 1 reserved channels for Korea, 0xA002 ~0xA009 for test mode -->
+  <string-array name="public_safety_messages_channels_range_strings" translatable="false">
+    <item>0x1114:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+    <item>0x1115-0x111B:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+    <item>0x1121:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+    <item>0xA002-0xA009:rat=gsm, emergency=true, type=info, testing_mode=true, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+  </string-array>
+
+  <!-- 40970~45055 biz purpose channels -->
+  <string-array name="additional_cbs_channels_strings" translatable="false">
+    <item>0xA00A-0xAFFF:rat=gsm, emergency=false, scope=carrier, exclude_from_sms_inbox=true, display=false</item>
+  </string-array>
+</resources>
diff --git a/res/values-mcc450-mnc06/config.xml b/res/values-mcc450-mnc06/config.xml
new file mode 100644
index 0000000..702865a
--- /dev/null
+++ b/res/values-mcc450-mnc06/config.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+  <!-- 4370, 4383, (0xA16A test-mode) -->
+  <!-- Emergency alert tone duration set to 1 minute for Korean users -->
+  <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
+    <item>0x1112:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
+    <item>0x111F:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
+    <item>0xA16A:rat=gsm, emergency=true, override_dnd=true, testing_mode=true</item>
+  </string-array>
+  <!-- 4371, 4384, (0xA16B test mode) -->
+  <string-array name="emergency_alerts_channels_range_strings" translatable="false">
+    <item>0x1113:rat=gsm, emergency=true, override_dnd=true</item>
+    <item>0x1120:rat=gsm, emergency=true, override_dnd=true</item>
+    <item>0xA16B:rat=gsm, emergency=true, override_dnd=true, testing_mode=true</item>
+  </string-array>
+  <!-- 4372, 4385, 4373~4379 Class 1 reserved channels for Korea, 0xA16A for test mode -->
+  <string-array name="public_safety_messages_channels_range_strings" translatable="false">
+    <item>0x1114:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+    <item>0x1115-0x111B:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+    <item>0x1121:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+    <item>0xA16C:rat=gsm, emergency=true, type=info, testing_mode=true, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+  </string-array>
+  <!-- 40990~45055 biz purpose channels -->
+  <string-array name="additional_cbs_channels_strings" translatable="false">
+    <item>0xA000-0xA169:rat=gsm, emergency=false, scope=carrier, exclude_from_sms_inbox=true, display=false</item>
+    <item>0xA16D-0xAFFF:rat=gsm, emergency=false, scope=carrier, exclude_from_sms_inbox=true, display=false</item>
+  </string-array>
+</resources>
diff --git a/res/values-mcc450-mr/strings.xml b/res/values-mcc450-mr/strings.xml
index 0ab1a64..27b71d8 100644
--- a/res/values-mcc450-mr/strings.xml
+++ b/res/values-mcc450-mr/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-ms/strings.xml b/res/values-mcc450-ms/strings.xml
index 9b6c478..39628d1 100644
--- a/res/values-mcc450-ms/strings.xml
+++ b/res/values-mcc450-ms/strings.xml
@@ -17,4 +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">"Amaran kecemasan kritikal"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefon anda boleh menghantar amaran, seperti arahan pemindahan semasa bencana alam berlaku. Perkhidmatan ini merupakan kerjasama antara Agensi Pengurusan Kecemasan Nasional, pembekal rangkaian dan pengilang peranti.\n\nAnda mungkin tidak akan mendapat amaran jika terdapat masalah dengan peranti anda atau jika keadaan rangkaian lemah."</string>
 </resources>
diff --git a/res/values-mcc450-my/strings.xml b/res/values-mcc450-my/strings.xml
index 1219e11..23514c0 100644
--- a/res/values-mcc450-my/strings.xml
+++ b/res/values-mcc450-my/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-nb/strings.xml b/res/values-mcc450-nb/strings.xml
index bfa5f18..8467045 100644
--- a/res/values-mcc450-nb/strings.xml
+++ b/res/values-mcc450-nb/strings.xml
@@ -17,4 +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">"Kritisk nødvarsel"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefonen kan sende deg varsler, for eksempel evakueringsinstruksjoner, under naturkatastrofer. Denne tjenesten er et samarbeid mellom National Emergency Management Agency, nettverksleverandører og enhetsprodusenter.\n\nDu får muligens ikke varsler hvis det har oppstått et problem med enheten din, eller hvis nettverksforholdene er dårlige."</string>
 </resources>
diff --git a/res/values-mcc450-ne/strings.xml b/res/values-mcc450-ne/strings.xml
index c553e1e..25e8dce 100644
--- a/res/values-mcc450-ne/strings.xml
+++ b/res/values-mcc450-ne/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-nl/strings.xml b/res/values-mcc450-nl/strings.xml
index b5a3ff3..1aec581 100644
--- a/res/values-mcc450-nl/strings.xml
+++ b/res/values-mcc450-nl/strings.xml
@@ -17,4 +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">"Kritieke noodmelding"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Je telefoon kan je meldingen, zoals evacuatie-instructies, sturen tijdens natuurrampen. Deze service is een samenwerking tussen de National Emergency Management Agency, netwerkproviders en fabrikanten van apparaten.\n\nMogelijk krijg je geen melding als er een probleem is met je apparaat of als het netwerk niet goed werkt."</string>
 </resources>
diff --git a/res/values-mcc450-or/strings.xml b/res/values-mcc450-or/strings.xml
index f62935b..4954f8b 100644
--- a/res/values-mcc450-or/strings.xml
+++ b/res/values-mcc450-or/strings.xml
@@ -17,4 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"ଜଟିଳ ପରିସ୍ଥିତି ଆଲର୍ଟ"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"ଆପଣଙ୍କ ଫୋନ୍ ପ୍ରାକୃତିକ ଦୁର୍ବିପାକ ସମୟରେ ସ୍ଥାନାନ୍ତର ନିର୍ଦ୍ଦେଶଗୁଡ଼ିକ ଭଳି ଆଲର୍ଟ ଆପଣଙ୍କୁ ପଠାଇପାରିବ। ଏହି ସେବା National Emergency Management Agency, ନେଟୱାର୍କ ପ୍ରଦାନକାରୀ ଏବଂ ଡିଭାଇସ୍ ନିର୍ମାତାମାନଙ୍କ ମଧ୍ୟରେ ଏକ ସହଯୋଗ ଅଟେ।\n\nଯଦି ଆପଣଙ୍କ ଡିଭାଇସରେ କୌଣସି ସମସ୍ୟା ଥାଏ କିମ୍ବା ନେଟୱାର୍କ ସ୍ଥିତି ଖରାପ ଥାଏ, ତେବେ ଆପଣ ଆଲର୍ଟ ପାଇନପାରନ୍ତି।"</string>
 </resources>
diff --git a/res/values-mcc450-pa/strings.xml b/res/values-mcc450-pa/strings.xml
index fc309cd..dc17f21 100644
--- a/res/values-mcc450-pa/strings.xml
+++ b/res/values-mcc450-pa/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-pl/strings.xml b/res/values-mcc450-pl/strings.xml
index bc67110..612e661 100644
--- a/res/values-mcc450-pl/strings.xml
+++ b/res/values-mcc450-pl/strings.xml
@@ -17,4 +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">"Alert o zagrożeniu krytycznym"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Podczas klęsk żywiołowych telefon może wysyłać Ci alerty, na przykład instrukcje dotyczące ewakuacji. Ta usługa powstała we współpracy z Krajową Agencją Zarządzania Kryzysowego, dostawcami usług sieciowych i producentami urządzeń.\n\nW przypadku problemów z urządzeniem lub złego stanu sieci alerty mogą być niedostępne."</string>
 </resources>
diff --git a/res/values-mcc450-pt-rPT/strings.xml b/res/values-mcc450-pt-rPT/strings.xml
index 09a6f1f..ebe4531 100644
--- a/res/values-mcc450-pt-rPT/strings.xml
+++ b/res/values-mcc450-pt-rPT/strings.xml
@@ -17,4 +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">"Alerta de emergência crítica"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"O telemóvel pode enviar-lhe alertas, como instruções de evacuação, durante desastres naturais. Este serviço é uma colaboração entre a National Emergency Management Agency (Agência Nacional de Gestão de Emergências da Coreia do Sul), os fornecedores de rede e os fabricantes de dispositivos.\n\nPode não receber alertas se houver um problema com o seu dispositivo ou se as condições de rede forem fracas."</string>
 </resources>
diff --git a/res/values-mcc450-pt/strings.xml b/res/values-mcc450-pt/strings.xml
index a755350..1962aa3 100644
--- a/res/values-mcc450-pt/strings.xml
+++ b/res/values-mcc450-pt/strings.xml
@@ -17,4 +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">"Alerta de emergência crítico"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Seu smartphone pode enviar alertas, como instruções de evacuação, durante desastres naturais. Esse serviço é uma colaboração entre a National Emergency Management Agency, provedoras de rede e fabricantes de dispositivos.\n\nTalvez você não receba alertas se houver algum problema com o dispositivo ou se as condições da rede estiverem ruins."</string>
 </resources>
diff --git a/res/values-mcc450-ro/strings.xml b/res/values-mcc450-ro/strings.xml
index 28e19be..288d73e 100644
--- a/res/values-mcc450-ro/strings.xml
+++ b/res/values-mcc450-ro/strings.xml
@@ -17,4 +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">"Alertă de urgență, nivel critic"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefonul dvs. vă poate trimite alerte, de exemplu instrucțiuni de evacuare, în timpul dezastrelor naturale. Acest serviciu reprezintă o colaborare între Agenția națională de gestionare a urgențelor, furnizorii de rețele și producătorii de dispozitive.\n\nProbabil că nu veți primi alerte dacă există o problemă legată de dispozitiv sau condițiile rețelei nu sunt optime."</string>
 </resources>
diff --git a/res/values-mcc450-ru/strings.xml b/res/values-mcc450-ru/strings.xml
index ade95fc..b8182fb 100644
--- a/res/values-mcc450-ru/strings.xml
+++ b/res/values-mcc450-ru/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-si/strings.xml b/res/values-mcc450-si/strings.xml
index 710efaf..d84f1b3 100644
--- a/res/values-mcc450-si/strings.xml
+++ b/res/values-mcc450-si/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-sk/strings.xml b/res/values-mcc450-sk/strings.xml
index ad2e9ba..6c256cc 100644
--- a/res/values-mcc450-sk/strings.xml
+++ b/res/values-mcc450-sk/strings.xml
@@ -17,4 +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">"Závažné tiesňové upozornenie"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"V telefóne môžete počas prírodných katastrof dostávať varovania, napríklad pokyny na evakuáciu. Na tejto službe sa podieľajú organizácia National Emergency Management Agency, poskytovatelia siete a výrobcovia zariadení.\n\nVarovania nemusíte dostať, ak sa vyskytne problém so zariadením alebo kvalitou siete."</string>
 </resources>
diff --git a/res/values-mcc450-sl/strings.xml b/res/values-mcc450-sl/strings.xml
index baf469c..e033664 100644
--- a/res/values-mcc450-sl/strings.xml
+++ b/res/values-mcc450-sl/strings.xml
@@ -17,4 +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">"Kritično opozorilo v sili"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefon vam lahko med naravnimi nesrečami pošilja opozorila, na primer navodila za evakuacijo. To storitev je plod sodelovanja med Državno agencijo za upravljanje ob nesrečah, operaterji omrežij in proizvajalci naprav.\n\nOpozoril morda ne boste mogli prejeti v primeru težav z napravo ali slabega signala omrežja."</string>
 </resources>
diff --git a/res/values-mcc450-sq/strings.xml b/res/values-mcc450-sq/strings.xml
index f79ea1c..375c6ce 100644
--- a/res/values-mcc450-sq/strings.xml
+++ b/res/values-mcc450-sq/strings.xml
@@ -17,4 +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">"Alarm kritik urgjence"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefoni yt mund të të dërgojë sinjalizime, si udhëzime për evakuimet, gjatë katastrofave natyrore. Ky shërbim është një bashkëpunim mes Agjencisë Kombëtare të Menaxhimit të Urgjencave, ofruesve të rrjetit dhe prodhuesve të pajisjeve.\n\nMund të mos marrësh sinjalizime nëse ka një problem me pajisjen tënde ose nëse kushtet e rrjetit janë të këqija."</string>
 </resources>
diff --git a/res/values-mcc450-sr/strings.xml b/res/values-mcc450-sr/strings.xml
index c92d1ee..f709ac3 100644
--- a/res/values-mcc450-sr/strings.xml
+++ b/res/values-mcc450-sr/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-sv/strings.xml b/res/values-mcc450-sv/strings.xml
index f38da2b..766aa11 100644
--- a/res/values-mcc450-sv/strings.xml
+++ b/res/values-mcc450-sv/strings.xml
@@ -17,4 +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">"Kritisk varning om nödsituation"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefonen kan skicka varningar, till exempel vägledning vid evakueringar, vid naturkatastrofer. Den här tjänsten är ett samarbete mellan National Emergency Management Agency, nätverksleverantörer och enhetstillverkare.\n\nDu kan inte får varningar om fel har uppstått på enheten eller med nätverket."</string>
 </resources>
diff --git a/res/values-mcc450-sw/strings.xml b/res/values-mcc450-sw/strings.xml
index 1038f0d..b2bdde1 100644
--- a/res/values-mcc450-sw/strings.xml
+++ b/res/values-mcc450-sw/strings.xml
@@ -17,4 +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">"Arifa ya dharura"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Simu yako inaweza kukutumia arifa, kama vile maagizo ya kuokolewa, wakati wa majanga. Huduma hii ni ushirikiano kati ya Shirika la Kitaifa la Usimamizi wa Dharura, kampuni zinazotoa huduma za mtandao na watengenezaji wa vifaa.\n\nHuenda usipate arifa ikiwa kuna hitilafu kwenye kifaa chako au ikiwa hali ya mitandao ni duni."</string>
 </resources>
diff --git a/res/values-mcc450-ta/strings.xml b/res/values-mcc450-ta/strings.xml
index ef21704..1cba328 100644
--- a/res/values-mcc450-ta/strings.xml
+++ b/res/values-mcc450-ta/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-te/strings.xml b/res/values-mcc450-te/strings.xml
index b409c95..f793100 100644
--- a/res/values-mcc450-te/strings.xml
+++ b/res/values-mcc450-te/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-th/strings.xml b/res/values-mcc450-th/strings.xml
index d69bbdf..f3d482b 100644
--- a/res/values-mcc450-th/strings.xml
+++ b/res/values-mcc450-th/strings.xml
@@ -17,4 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"การแจ้งเหตุฉุกเฉินที่สำคัญ"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"โทรศัพท์จะส่งการแจ้งเตือนให้คุณ เช่น คำสั่งอพยพระหว่างเกิดภัยพิบัติทางธรรมชาติ บริการนี้เป็นการทำงานร่วมกันระหว่างสำนักงานการจัดการภาวะฉุกเฉินแห่งชาติ (National Emergency Management Agency) ผู้ให้บริการเครือข่าย และผู้ผลิตอุปกรณ์\n\nคุณอาจไม่ได้รับการแจ้งเตือนหากอุปกรณ์มีปัญหาหรือเครือข่ายอยู่ในสภาวะที่ไม่ดี"</string>
 </resources>
diff --git a/res/values-mcc450-tl/strings.xml b/res/values-mcc450-tl/strings.xml
index 4d0789c..a12eb9f 100644
--- a/res/values-mcc450-tl/strings.xml
+++ b/res/values-mcc450-tl/strings.xml
@@ -17,4 +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">"Mahalagang alertong pang-emergency"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Puwede kang padalhan ng iyong telepono ng mga alerto, tulad ng mga tagubilin sa paglikas, kapag may mga natural na sakuna. Ang serbisyong ito ay sama-samang pagsisikap ng National Emergency Management Agency, mga network provider, at mga manufacturer ng device.\n\nBaka hindi ka makatanggap ng mga alerto kung may problema sa iyong device o kung hindi maganda ang mga kundisyon ng network."</string>
 </resources>
diff --git a/res/values-mcc450-tr/strings.xml b/res/values-mcc450-tr/strings.xml
index d7d73c7..1ad7b8a 100644
--- a/res/values-mcc450-tr/strings.xml
+++ b/res/values-mcc450-tr/strings.xml
@@ -17,4 +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">"Kritik acil durum uyarısı"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Telefonunuz doğal felaketler sırasında tahliye emirleri gibi uyarıları size gönderebilir. Bu hizmet Ulusal Acil Durum Yönetim Dairesi, ağ sağlayıcılar ve cihaz üreticileri arasında iş birliğiyle sunulmaktadır.\n\nCihazınızda sorun olması veya ağ koşullarının kötü olması durumunda uyarı almayabilirsiniz."</string>
 </resources>
diff --git a/res/values-mcc450-uk/strings.xml b/res/values-mcc450-uk/strings.xml
index 667ffca..0331132 100644
--- a/res/values-mcc450-uk/strings.xml
+++ b/res/values-mcc450-uk/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-ur/strings.xml b/res/values-mcc450-ur/strings.xml
index 35e997f..2fc708d 100644
--- a/res/values-mcc450-ur/strings.xml
+++ b/res/values-mcc450-ur/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-uz/strings.xml b/res/values-mcc450-uz/strings.xml
index 8fbc48f..2edfa06 100644
--- a/res/values-mcc450-uz/strings.xml
+++ b/res/values-mcc450-uz/strings.xml
@@ -17,4 +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">"Favqulodda jiddiy ogohlantirish"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Tabiiy ofatlar vaqtida telefoningiz evakuatsiya koʻrsatmalari kabi muhim xabarlarni chiqarishi mumkin. Bu xizmat Milliy favqulodda vaziyatlarni boshqarish agentligi, tarmoq operatorlari va qurilma ishlab chiqaruvchilari tomonidan birgalikda ishlab chiqilgan.\n\nQurilmada yoki tarmoqda muammolar boʻlsa, sizga muhim xabarlar kelmasligi mumkin."</string>
 </resources>
diff --git a/res/values-mcc450-vi/strings.xml b/res/values-mcc450-vi/strings.xml
index 684d553..891ecbc 100644
--- a/res/values-mcc450-vi/strings.xml
+++ b/res/values-mcc450-vi/strings.xml
@@ -17,4 +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">"Cảnh báo khẩn cấp quan trọng"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Điện thoại có thể gửi cho bạn các cảnh báo, chẳng hạn như hướng dẫn sơ tán khi xảy ra thiên tai. Dịch vụ này là kết quả hợp tác giữa Cơ quan Quản lý Tình trạng Khẩn cấp Quốc gia, nhà mạng và nhà sản xuất thiết bị.\n\nBạn có thể không nhận được cảnh báo nếu thiết bị gặp sự cố hoặc nếu kết nối mạng kém."</string>
 </resources>
diff --git a/res/values-mcc450-zh-rCN/strings.xml b/res/values-mcc450-zh-rCN/strings.xml
index 377fc44..1286a98 100644
--- a/res/values-mcc450-zh-rCN/strings.xml
+++ b/res/values-mcc450-zh-rCN/strings.xml
@@ -17,4 +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>
 </resources>
diff --git a/res/values-mcc450-zh-rHK/strings.xml b/res/values-mcc450-zh-rHK/strings.xml
index 1155c40..8adc5d5 100644
--- a/res/values-mcc450-zh-rHK/strings.xml
+++ b/res/values-mcc450-zh-rHK/strings.xml
@@ -17,4 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"嚴重緊急警示"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"如果發生天災,手機就會向您傳送警示,例如疏散指示。此服務由南韓消防防災廳 (National Emergency Management Agency)、網絡供應商和裝置製造商共同提供。\n\n如您的裝置發生問題或網絡狀況不佳,可能不會收到警示。"</string>
 </resources>
diff --git a/res/values-mcc450-zh-rTW/strings.xml b/res/values-mcc450-zh-rTW/strings.xml
index 2e577f3..82e2d32 100644
--- a/res/values-mcc450-zh-rTW/strings.xml
+++ b/res/values-mcc450-zh-rTW/strings.xml
@@ -17,4 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="cmas_presidential_level_alert" msgid="6968323372438785870">"重大緊急警示"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"如果發生天災,手機就會傳送警報給你,例如疏散指示。這項服務是由南韓消防防災廳 (National Emergency Management Agency)、網路服務供應商和裝置製造商共同提供。\n\n假如你的裝置發生問題或網路訊號不佳,可能就不會收到警報。"</string>
 </resources>
diff --git a/res/values-mcc450-zu/strings.xml b/res/values-mcc450-zu/strings.xml
index b51c3bc..e5dfd48 100644
--- a/res/values-mcc450-zu/strings.xml
+++ b/res/values-mcc450-zu/strings.xml
@@ -17,4 +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">"Isexwayiso sokuphuthumayo okubalulekile"</string>
+    <string name="alerts_header_summary" msgid="8898082819299479687">"Ifoni yakho ingakuthumela izexwayiso, njengemiyalelo yokuphuma, phakathi nenhlekelele yemvelo. Le sevisi iyinhlanganyelo ephakathi Kwesikhungo Sokuphathwa Kwezimo Eziphuthumayo Sikazwelonke, abahlinzeki benethiwekhi, kanye nabakhiqizi bedivayisi.\n\nUngahle ungazitholi izexwayiso uma kunenkinga ngedivayisi yakho noma uma izimo zenethiwekhi zingezinhle."</string>
 </resources>
diff --git a/res/values-mcc450/config.xml b/res/values-mcc450/config.xml
index 96b6813..4833984 100644
--- a/res/values-mcc450/config.xml
+++ b/res/values-mcc450/config.xml
@@ -21,24 +21,30 @@
     <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-->
+    <bool name="show_public_safety_full_screen_settings">true</bool>
 
-    <!-- 4370 -->
+    <!-- 4370, 4383 -->
     <!-- Emergecny alert tone duration set to 1 minute for Korean users -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, alert_duration=60000</item>
+        <item>0x1112:rat=gsm, emergency=true, always_on=true, override_dnd=true</item>
+        <item>0x111F:rat=gsm, emergency=true, always_on=true, override_dnd=true</item>
     </string-array>
-    <!-- 4371 -->
+    <!-- 4371, 4384 -->
     <string-array name="emergency_alerts_channels_range_strings" translatable="false">
-        <item>0x1113:rat=gsm, emergency=true, alert_duration=60000</item>
+        <item>0x1113:rat=gsm, emergency=true, override_dnd=true</item>
+        <item>0x1120:rat=gsm, emergency=true, override_dnd=true</item>
     </string-array>
-    <!-- 4372 -->
+    <!-- 4372, 4385, 4373~4379 Class 1 reserved channels for Korea -->
     <string-array name="public_safety_messages_channels_range_strings" translatable="false">
-        <item>0x1114:rat=gsm, emergency=false, alert_duration=60000</item>
+        <item>0x1114:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+        <item>0x1115-0x111B:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
+        <item>0x1121:rat=gsm, emergency=true, type=info, screen_on_duration=0, dismiss_on_outside_touch=true</item>
     </string-array>
-    <!-- 4373~4379, 40960~45055-->
+    <!-- 40960~45055 biz purpose channels -->
     <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0x1115-0x111B:rat=gsm, emergency=true, alert_duration=60000</item>
-        <item>0xA000-0xAFFF:rat=gsm, emergency=false, scope=carrier, exclude_from_sms_inbox=true</item>
+        <item>0xA000-0xAFFF:rat=gsm, emergency=false, scope=carrier, exclude_from_sms_inbox=true, display=false</item>
     </string-array>
 
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
@@ -50,6 +56,9 @@
     <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
     <bool name="watch_enable_non_emergency_audio">true</bool>
 
-    <!-- Always play alert at full volume regardless silent/do-not-disturb mode for Korean users -->
-    <bool name="override_dnd_default">true</bool>
+    <!-- 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>
+    <bool name="show_alert_dialog_with_notification">true</bool>
 </resources>
diff --git a/res/values-mcc450/strings.xml b/res/values-mcc450/strings.xml
index af8149f..c9c5121 100644
--- a/res/values-mcc450/strings.xml
+++ b/res/values-mcc450/strings.xml
@@ -19,4 +19,11 @@
 
     <!-- Dialog title for presidential level alert. [CHAR LIMIT=50] -->
     <string name="cmas_presidential_level_alert">Critical emergency alert</string>
-</resources>
\ No newline at end of file
+
+    <!-- Preference summary the "about cell broadcast messages" info required for some carriers.
+      Required Korean (ko) translation for this message:
+      "자연재해 및 긴급 재난 발생 시 휴대폰을 소지한 국민들에게 신속하게 국민행동요령 등 긴급 재난정보를 제공하는 서비스입니다\n\n※ 정부기관과 이동통신사 및 단말기 제조사의 협력으로 제공하는 공익적인 서비스로 단말기 및 통신망의 상태에 따라 수신이 안될 수 있음"
+ -->
+    <string name="alerts_header_summary">Your phone can send you alerts, like evacuation instructions, during natural disasters. This service is a collaboration between the National Emergency Management Agency, network providers, and device manufacturers.\n\nYou may not get alerts if there’s a problem with your device or if network conditions are poor.</string>
+
+</resources>
diff --git a/res/values-mcc454-af/strings.xml b/res/values-mcc454-af/strings.xml
new file mode 100644
index 0000000..72376bd
--- /dev/null
+++ b/res/values-mcc454-af/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Uiterste noodwaarskuwing"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Noodwaarskuwing"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Toetsboodskap"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Ontvang noodwaarskuwings"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Toetsboodskappe"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Ontvang toetsboodskappe"</string>
+</resources>
diff --git a/res/values-mcc454-am/strings.xml b/res/values-mcc454-am/strings.xml
new file mode 100644
index 0000000..2aba675
--- /dev/null
+++ b/res/values-mcc454-am/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"የሙከራ መልዕክቶች"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"የሙከራ መልዕክቶችን ይቀበሉ"</string>
+</resources>
diff --git a/res/values-mcc454-ar/strings.xml b/res/values-mcc454-ar/strings.xml
new file mode 100644
index 0000000..94edb98
--- /dev/null
+++ b/res/values-mcc454-ar/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"رسائل اختبار"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"تلقّي رسائل اختبار"</string>
+</resources>
diff --git a/res/values-mcc454-as/strings.xml b/res/values-mcc454-as/strings.xml
new file mode 100644
index 0000000..dac8058
--- /dev/null
+++ b/res/values-mcc454-as/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"পাঠ বাৰ্তা"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"পৰীক্ষামূলক বাৰ্তা গ্ৰহণ কৰক"</string>
+</resources>
diff --git a/res/values-mcc454-az/strings.xml b/res/values-mcc454-az/strings.xml
new file mode 100644
index 0000000..a65c7d8
--- /dev/null
+++ b/res/values-mcc454-az/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Ekstremal Həyəcan Siqnalı"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Həyəcan Siqnalı"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Test Mesajı"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Həyəcan siqnalları alın"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Test mesajları"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Test mesajları alın"</string>
+</resources>
diff --git a/res/values-mcc454-b+sr+Latn/strings.xml b/res/values-mcc454-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..8b6e2b3
--- /dev/null
+++ b/res/values-mcc454-b+sr+Latn/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Obaveštenje o izuzetno hitnom slučaju"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Obaveštenje o hitnom slučaju"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Probna poruka"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Prijem obaveštenja o hitnim slučajevima"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Probne poruke"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Prijem probnih poruka"</string>
+</resources>
diff --git a/res/values-mcc454-be/strings.xml b/res/values-mcc454-be/strings.xml
new file mode 100644
index 0000000..0be11f7
--- /dev/null
+++ b/res/values-mcc454-be/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Тэставыя паведамленні"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Атрымліваць тэставыя паведамленні"</string>
+</resources>
diff --git a/res/values-mcc454-bg/strings.xml b/res/values-mcc454-bg/strings.xml
new file mode 100644
index 0000000..09822b0
--- /dev/null
+++ b/res/values-mcc454-bg/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Тестови съобщения"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Получаване на тестови съобщения"</string>
+</resources>
diff --git a/res/values-mcc454-bn/strings.xml b/res/values-mcc454-bn/strings.xml
new file mode 100644
index 0000000..4e8a63c
--- /dev/null
+++ b/res/values-mcc454-bn/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"পরীক্ষামূলক মেসেজ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"পরীক্ষামূলক মেসেজ পান"</string>
+</resources>
diff --git a/res/values-mcc454-bs/strings.xml b/res/values-mcc454-bs/strings.xml
new file mode 100644
index 0000000..ea49580
--- /dev/null
+++ b/res/values-mcc454-bs/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Izuzetno hitno upozorenje"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Hitno upozorenje"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Probna poruka"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Primanje hitnih upozorenja"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Probne poruke"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Primanje probnih poruka"</string>
+</resources>
diff --git a/res/values-mcc454-ca/strings.xml b/res/values-mcc454-ca/strings.xml
new file mode 100644
index 0000000..f40875a
--- /dev/null
+++ b/res/values-mcc454-ca/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerta d\'emergències extrema"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerta d\'emergències"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Missatge de prova"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Rep alertes d\'emergència"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Missatges de prova"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Rep missatges de prova"</string>
+</resources>
diff --git a/res/values-mcc454-cs/strings.xml b/res/values-mcc454-cs/strings.xml
new file mode 100644
index 0000000..32d9c40
--- /dev/null
+++ b/res/values-mcc454-cs/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Upozornění na mimořádnou nouzovou situaci"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Výstražná zpráva"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testovací zpráva"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Příjem výstražných zpráv"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testovací zprávy"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Příjem testovacích zpráv"</string>
+</resources>
diff --git a/res/values-mcc454-da/strings.xml b/res/values-mcc454-da/strings.xml
new file mode 100644
index 0000000..c70d38d
--- /dev/null
+++ b/res/values-mcc454-da/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Meget alvorlig nødalarm"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Nødalarm"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testmeddelelse"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Modtag nødalarmer"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testmeddelelser"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Modtag testmeddelelser"</string>
+</resources>
diff --git a/res/values-mcc454-de/strings.xml b/res/values-mcc454-de/strings.xml
new file mode 100644
index 0000000..8cf49af
--- /dev/null
+++ b/res/values-mcc454-de/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Benachrichtigung bei extremen Notfällen"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Notfallwarnung"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testnachricht"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Notfallbenachrichtigungen erhalten"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testnachrichten"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Testnachrichten erhalten"</string>
+</resources>
diff --git a/res/values-mcc454-el/strings.xml b/res/values-mcc454-el/strings.xml
new file mode 100644
index 0000000..ad11201
--- /dev/null
+++ b/res/values-mcc454-el/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Δοκιμαστικά μηνύματα"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Λήψη δοκιμαστικών μηνυμάτων"</string>
+</resources>
diff --git a/res/values-mcc454-en-rAU/strings.xml b/res/values-mcc454-en-rAU/strings.xml
new file mode 100644
index 0000000..df94542
--- /dev/null
+++ b/res/values-mcc454-en-rAU/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Extreme emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Emergency alert"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Test message"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Receive emergency alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Test messages"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Receive test messages"</string>
+</resources>
diff --git a/res/values-mcc454-en-rCA/strings.xml b/res/values-mcc454-en-rCA/strings.xml
new file mode 100644
index 0000000..df94542
--- /dev/null
+++ b/res/values-mcc454-en-rCA/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Extreme emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Emergency alert"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Test message"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Receive emergency alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Test messages"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Receive test messages"</string>
+</resources>
diff --git a/res/values-mcc454-en-rGB/strings.xml b/res/values-mcc454-en-rGB/strings.xml
new file mode 100644
index 0000000..df94542
--- /dev/null
+++ b/res/values-mcc454-en-rGB/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Extreme emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Emergency alert"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Test message"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Receive emergency alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Test messages"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Receive test messages"</string>
+</resources>
diff --git a/res/values-mcc454-en-rIN/strings.xml b/res/values-mcc454-en-rIN/strings.xml
new file mode 100644
index 0000000..df94542
--- /dev/null
+++ b/res/values-mcc454-en-rIN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Extreme emergency alert"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Emergency alert"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Test message"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Receive emergency alerts"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Test messages"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Receive test messages"</string>
+</resources>
diff --git a/res/values-mcc454-en-rXC/strings.xml b/res/values-mcc454-en-rXC/strings.xml
new file mode 100644
index 0000000..a311a2b
--- /dev/null
+++ b/res/values-mcc454-en-rXC/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎Extreme Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎Emergency Alert‎‏‎‎‏‎"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎Test Message‎‏‎‎‏‎"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎Receive emergency alerts‎‏‎‎‏‎"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎Test messages‎‏‎‎‏‎"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‎Receive test messages‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-mcc454-es-rUS/strings.xml b/res/values-mcc454-es-rUS/strings.xml
new file mode 100644
index 0000000..1a5480c
--- /dev/null
+++ b/res/values-mcc454-es-rUS/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerta de emergencia extrema"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerta de emergencia"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Mensaje de prueba"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Recibir alertas de emergencia"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mensajes de prueba"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Recibir mensajes de prueba"</string>
+</resources>
diff --git a/res/values-mcc454-es/strings.xml b/res/values-mcc454-es/strings.xml
new file mode 100644
index 0000000..1a5480c
--- /dev/null
+++ b/res/values-mcc454-es/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerta de emergencia extrema"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerta de emergencia"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Mensaje de prueba"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Recibir alertas de emergencia"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mensajes de prueba"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Recibir mensajes de prueba"</string>
+</resources>
diff --git a/res/values-mcc454-et/strings.xml b/res/values-mcc454-et/strings.xml
new file mode 100644
index 0000000..5026981
--- /dev/null
+++ b/res/values-mcc454-et/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Ekstreemse hädaolukorra märguanne"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Hädaolukorra märguanne"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testsõnum"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Hädaolukorra märguannete saamine"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testsõnumid"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Testsõnumite saamine"</string>
+</resources>
diff --git a/res/values-mcc454-eu/strings.xml b/res/values-mcc454-eu/strings.xml
new file mode 100644
index 0000000..c72633e
--- /dev/null
+++ b/res/values-mcc454-eu/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Muturreko larrialdi-alerta"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Larrialdi-alerta"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Probako mezua"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Jaso larrialdi-mezuak"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Probako mezuak"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Jaso probako mezuak"</string>
+</resources>
diff --git a/res/values-mcc454-fa/strings.xml b/res/values-mcc454-fa/strings.xml
new file mode 100644
index 0000000..310dd42
--- /dev/null
+++ b/res/values-mcc454-fa/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"پیام‌های آزمایشی"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"دریافت پیام‌های آزمایشی"</string>
+</resources>
diff --git a/res/values-mcc454-fi/strings.xml b/res/values-mcc454-fi/strings.xml
new file mode 100644
index 0000000..f012abb
--- /dev/null
+++ b/res/values-mcc454-fi/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Erittäin vakava vaaratiedote"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Vaaratiedote"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Koeviesti"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Vastaanota vaaratiedotteita"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Koeviestit"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Vastaanota koeviestejä"</string>
+</resources>
diff --git a/res/values-mcc454-fr-rCA/strings.xml b/res/values-mcc454-fr-rCA/strings.xml
new file mode 100644
index 0000000..6740887
--- /dev/null
+++ b/res/values-mcc454-fr-rCA/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerte d\'urgence extrême"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerte d\'urgence"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Message test"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Recevoir les alertes d\'urgence"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Messages test"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Recevoir les messages test"</string>
+</resources>
diff --git a/res/values-mcc454-fr/strings.xml b/res/values-mcc454-fr/strings.xml
new file mode 100644
index 0000000..91e99da
--- /dev/null
+++ b/res/values-mcc454-fr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerte d\'urgence extrême"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerte d\'urgence"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Message test"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Recevoir les alertes d\'urgence"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Messages test"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Recevoir des messages test"</string>
+</resources>
diff --git a/res/values-mcc454-gl/strings.xml b/res/values-mcc454-gl/strings.xml
new file mode 100644
index 0000000..98bd7c3
--- /dev/null
+++ b/res/values-mcc454-gl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerta de emerxencia extrema"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerta de emerxencia"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Mensaxe de proba"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Recibir alertas de emerxencia"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mensaxes de proba"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Recibir mensaxes de proba"</string>
+</resources>
diff --git a/res/values-mcc454-gu/strings.xml b/res/values-mcc454-gu/strings.xml
new file mode 100644
index 0000000..6c3f34a
--- /dev/null
+++ b/res/values-mcc454-gu/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"પરીક્ષણ માટેના સંદેશા"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"પરીક્ષણ માટેના સંદેશા પ્રાપ્ત કરો"</string>
+</resources>
diff --git a/res/values-mcc454-hi/strings.xml b/res/values-mcc454-hi/strings.xml
new file mode 100644
index 0000000..2a9b4ec
--- /dev/null
+++ b/res/values-mcc454-hi/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"टेस्ट मैसेज"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"टेस्ट मैसेज पाएं"</string>
+</resources>
diff --git a/res/values-mcc454-hr/strings.xml b/res/values-mcc454-hr/strings.xml
new file mode 100644
index 0000000..3440be8
--- /dev/null
+++ b/res/values-mcc454-hr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Hitno upozorenje o ekstremnoj situaciji"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Hitno upozorenje"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testna poruka"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Primanje hitnih upozorenja"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testne poruke"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Primanje testnih poruka"</string>
+</resources>
diff --git a/res/values-mcc454-hu/strings.xml b/res/values-mcc454-hu/strings.xml
new file mode 100644
index 0000000..4c0a68a
--- /dev/null
+++ b/res/values-mcc454-hu/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Rendkívüli vészjelzés"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Vészjelzés"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Tesztüzenet"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Vészjelzések fogadása"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Tesztüzenetek"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Tesztüzenetek fogadása"</string>
+</resources>
diff --git a/res/values-mcc454-hy/strings.xml b/res/values-mcc454-hy/strings.xml
new file mode 100644
index 0000000..25b63c4
--- /dev/null
+++ b/res/values-mcc454-hy/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Փորձնական հաղորդագրություններ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Ստանալ փորձնական հաղորդագրություններ"</string>
+</resources>
diff --git a/res/values-mcc454-in/strings.xml b/res/values-mcc454-in/strings.xml
new file mode 100644
index 0000000..4017814
--- /dev/null
+++ b/res/values-mcc454-in/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Peringatan Darurat Ekstrem"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Peringatan Darurat"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Pesan Pengujian"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Menerima peringatan darurat"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Pesan pengujian"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Menerima pesan pengujian"</string>
+</resources>
diff --git a/res/values-mcc454-is/strings.xml b/res/values-mcc454-is/strings.xml
new file mode 100644
index 0000000..6014515
--- /dev/null
+++ b/res/values-mcc454-is/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alvarleg neyðarviðvörun"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Neyðarviðvörun"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Prufuskilaboð"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Móttaka neyðarviðvaranir"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Prufuskilaboð"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Móttaka prufuskilaboð"</string>
+</resources>
diff --git a/res/values-mcc454-it/strings.xml b/res/values-mcc454-it/strings.xml
new file mode 100644
index 0000000..c71ca94
--- /dev/null
+++ b/res/values-mcc454-it/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_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>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Ricevi messaggi di test"</string>
+</resources>
diff --git a/res/values-mcc454-iw/strings.xml b/res/values-mcc454-iw/strings.xml
new file mode 100644
index 0000000..f77239c
--- /dev/null
+++ b/res/values-mcc454-iw/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"הודעות בדיקה"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"קבלת הודעות בדיקה"</string>
+</resources>
diff --git a/res/values-mcc454-ja/strings.xml b/res/values-mcc454-ja/strings.xml
new file mode 100644
index 0000000..ba9d144
--- /dev/null
+++ b/res/values-mcc454-ja/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"テスト メッセージ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"テスト メッセージを受け取る"</string>
+</resources>
diff --git a/res/values-mcc454-ka/strings.xml b/res/values-mcc454-ka/strings.xml
new file mode 100644
index 0000000..a1c0496
--- /dev/null
+++ b/res/values-mcc454-ka/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"სატესტო შეტყობინებები"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"სატესტო შეტყობინებების მიღება"</string>
+</resources>
diff --git a/res/values-mcc454-kk/strings.xml b/res/values-mcc454-kk/strings.xml
new file mode 100644
index 0000000..2bf12ae
--- /dev/null
+++ b/res/values-mcc454-kk/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Сынақ хабарлары"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Сынақ хабарларын алу"</string>
+</resources>
diff --git a/res/values-mcc454-km/strings.xml b/res/values-mcc454-km/strings.xml
new file mode 100644
index 0000000..e385285
--- /dev/null
+++ b/res/values-mcc454-km/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"សារ​សាកល្បង"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"ទទួលសារ​សាកល្បង"</string>
+</resources>
diff --git a/res/values-mcc454-kn/strings.xml b/res/values-mcc454-kn/strings.xml
new file mode 100644
index 0000000..5fd4131
--- /dev/null
+++ b/res/values-mcc454-kn/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"ಪರೀಕ್ಷಾ ಸಂದೇಶಗಳು"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"ಪರೀಕ್ಷಾ ಸಂದೇಶಗಳನ್ನು ಸ್ವೀಕರಿಸಿ"</string>
+</resources>
diff --git a/res/values-mcc454-ko/strings.xml b/res/values-mcc454-ko/strings.xml
new file mode 100644
index 0000000..0b6f766
--- /dev/null
+++ b/res/values-mcc454-ko/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"테스트 메시지"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"테스트 메시지 받기"</string>
+</resources>
diff --git a/res/values-mcc454-ky/strings.xml b/res/values-mcc454-ky/strings.xml
new file mode 100644
index 0000000..4a9d1ba
--- /dev/null
+++ b/res/values-mcc454-ky/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Сынамык билдирүүлөр"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Сынамык билдирүүлөрдү алуу"</string>
+</resources>
diff --git a/res/values-mcc454-lo/strings.xml b/res/values-mcc454-lo/strings.xml
new file mode 100644
index 0000000..e27ff7b
--- /dev/null
+++ b/res/values-mcc454-lo/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"ຂໍ້ຄວາມທົດສອບ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"ຮັບຂໍ້ຄວາມທົດສອບ"</string>
+</resources>
diff --git a/res/values-mcc454-lt/strings.xml b/res/values-mcc454-lt/strings.xml
new file mode 100644
index 0000000..91fcc30
--- /dev/null
+++ b/res/values-mcc454-lt/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Skubus įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Įspėjimas apie kritinę padėtį"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Bandomasis pranešimas"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Gauti įspėjimus apie kritinę padėtį"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Bandomieji pranešimai"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Gauti bandomuosius pranešimus"</string>
+</resources>
diff --git a/res/values-mcc454-lv/strings.xml b/res/values-mcc454-lv/strings.xml
new file mode 100644
index 0000000..a4829f4
--- /dev/null
+++ b/res/values-mcc454-lv/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Ārkārtas situācijas trauksme"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Ārkārtas situācijas brīdinājums"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testa ziņojums"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Saņemt ārkārtas situāciju brīdinājumus"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testa ziņojumi"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Saņemt testa ziņojumus"</string>
+</resources>
diff --git a/res/values-mcc454-mk/strings.xml b/res/values-mcc454-mk/strings.xml
new file mode 100644
index 0000000..b3a4b31
--- /dev/null
+++ b/res/values-mcc454-mk/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Тест-пораки"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Примај тест-пораки"</string>
+</resources>
diff --git a/res/values-mcc454-ml/strings.xml b/res/values-mcc454-ml/strings.xml
new file mode 100644
index 0000000..9ca15a2
--- /dev/null
+++ b/res/values-mcc454-ml/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"ടെസ്‌റ്റ് സന്ദേശങ്ങൾ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"ടെസ്റ്റ് സന്ദേശങ്ങൾ സ്വീകരിക്കുക"</string>
+</resources>
diff --git a/res/values-mcc454-mn/strings.xml b/res/values-mcc454-mn/strings.xml
new file mode 100644
index 0000000..0042573
--- /dev/null
+++ b/res/values-mcc454-mn/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Туршилтын мессеж"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Туршилтын мессеж хүлээн авах"</string>
+</resources>
diff --git a/res/values-mcc454-mr/strings.xml b/res/values-mcc454-mr/strings.xml
new file mode 100644
index 0000000..583cd89
--- /dev/null
+++ b/res/values-mcc454-mr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"चाचणी मेसेज"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"चाचणी मेसेज मिळवा"</string>
+</resources>
diff --git a/res/values-mcc454-ms/strings.xml b/res/values-mcc454-ms/strings.xml
new file mode 100644
index 0000000..3b45d80
--- /dev/null
+++ b/res/values-mcc454-ms/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Amaran Kecemasan Ekstrem"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Amaran Kecemasan"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Mesej Ujian"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Terima amaran kecemasan"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mesej ujian"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Terima mesej ujian"</string>
+</resources>
diff --git a/res/values-mcc454-my/strings.xml b/res/values-mcc454-my/strings.xml
new file mode 100644
index 0000000..6c41572
--- /dev/null
+++ b/res/values-mcc454-my/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"စမ်းသပ် မက်ဆေ့ဂ်ျများ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"စမ်းသပ် မက်ဆေ့ဂျ်များ လက်ခံသည်"</string>
+</resources>
diff --git a/res/values-mcc454-nb/strings.xml b/res/values-mcc454-nb/strings.xml
new file mode 100644
index 0000000..2827d86
--- /dev/null
+++ b/res/values-mcc454-nb/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Varsel for ekstreme nødssituasjoner"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Nødvarsel"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testmelding"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Motta nødvarsler"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testmeldinger"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Motta testmeldinger"</string>
+</resources>
diff --git a/res/values-mcc454-ne/strings.xml b/res/values-mcc454-ne/strings.xml
new file mode 100644
index 0000000..3096c69
--- /dev/null
+++ b/res/values-mcc454-ne/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"परीक्षण म्यासेजहरू"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"परीक्षण म्यासेजहरू प्राप्त गर्नुहोस्"</string>
+</resources>
diff --git a/res/values-mcc454-nl/strings.xml b/res/values-mcc454-nl/strings.xml
new file mode 100644
index 0000000..a3051f8
--- /dev/null
+++ b/res/values-mcc454-nl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Melding voor extreme noodsituatie"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Noodmelding"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testbericht"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Noodmeldingen ontvangen"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testberichten"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Testberichten ontvangen"</string>
+</resources>
diff --git a/res/values-mcc454-or/strings.xml b/res/values-mcc454-or/strings.xml
new file mode 100644
index 0000000..31bcee5
--- /dev/null
+++ b/res/values-mcc454-or/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"ଟେଷ୍ଟ ମେସେଜଗୁଡ଼ିକ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"ଟେଷ୍ଟ ମେସେଜଗୁଡ଼ିକୁ ପାଆନ୍ତୁ"</string>
+</resources>
diff --git a/res/values-mcc454-pa/strings.xml b/res/values-mcc454-pa/strings.xml
new file mode 100644
index 0000000..2f30b2a
--- /dev/null
+++ b/res/values-mcc454-pa/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"ਜਾਂਚ ਸੁਨੇਹੇ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"ਜਾਂਚ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+</resources>
diff --git a/res/values-mcc454-pl/strings.xml b/res/values-mcc454-pl/strings.xml
new file mode 100644
index 0000000..645001e
--- /dev/null
+++ b/res/values-mcc454-pl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alert o ekstremalnym zagrożeniu"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alert o zagrożeniu"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Wiadomość testowa"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Otrzymuj alerty o zagrożeniu"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Wiadomości testowe"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Otrzymuj wiadomości testowe"</string>
+</resources>
diff --git a/res/values-mcc454-pt-rPT/strings.xml b/res/values-mcc454-pt-rPT/strings.xml
new file mode 100644
index 0000000..13faabb
--- /dev/null
+++ b/res/values-mcc454-pt-rPT/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerta extremo de emergência"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerta de emergência"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Mensagem de teste"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Receba alertas de emergência."</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mensagens de teste"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Receba mensagens de teste."</string>
+</resources>
diff --git a/res/values-mcc454-pt/strings.xml b/res/values-mcc454-pt/strings.xml
new file mode 100644
index 0000000..fb789f3
--- /dev/null
+++ b/res/values-mcc454-pt/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerta de emergência extrema"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerta de emergência"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Mensagem de teste"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Receber alertas de emergência"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mensagens de teste"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Receber mensagens de teste"</string>
+</resources>
diff --git a/res/values-mcc454-ro/strings.xml b/res/values-mcc454-ro/strings.xml
new file mode 100644
index 0000000..6194d3b
--- /dev/null
+++ b/res/values-mcc454-ro/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alertă pentru urgențe extreme"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alertă de urgență"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Mesaj de test"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Primiți alerte de urgență"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mesaje de test"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Primiți mesaje de test"</string>
+</resources>
diff --git a/res/values-mcc454-ru/strings.xml b/res/values-mcc454-ru/strings.xml
new file mode 100644
index 0000000..e55569d
--- /dev/null
+++ b/res/values-mcc454-ru/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Тестовые оповещения"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Получать тестовые оповещения"</string>
+</resources>
diff --git a/res/values-mcc454-si/strings.xml b/res/values-mcc454-si/strings.xml
new file mode 100644
index 0000000..f4c72af
--- /dev/null
+++ b/res/values-mcc454-si/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"පෙළ පණිවිඩ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"පරීක්ෂණ පණිවිඩ ලබා ගන්න"</string>
+</resources>
diff --git a/res/values-mcc454-sk/strings.xml b/res/values-mcc454-sk/strings.xml
new file mode 100644
index 0000000..9887ef1
--- /dev/null
+++ b/res/values-mcc454-sk/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Upozornenie v krajnej núdzi"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Tiesňové upozornenie"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testovacia správa"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Dostávať tiesňové upozornenia"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testovacie správy"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Dostávať testovacie správy"</string>
+</resources>
diff --git a/res/values-mcc454-sl/strings.xml b/res/values-mcc454-sl/strings.xml
new file mode 100644
index 0000000..e119a06
--- /dev/null
+++ b/res/values-mcc454-sl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Izredno opozorilo"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Opozorilo v sili"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Preizkusno sporočilo"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Prejemanje opozoril v sili"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Preizkusna sporočila"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Prejemanje preizkusnih sporočil"</string>
+</resources>
diff --git a/res/values-mcc454-sq/strings.xml b/res/values-mcc454-sq/strings.xml
new file mode 100644
index 0000000..82ce470
--- /dev/null
+++ b/res/values-mcc454-sq/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Sinjalizimi i urgjencës ekstreme"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Sinjalizimi i urgjencës"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Mesazh testimi"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Merr sinjalizimet e urgjencës"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mesazhet e testimit"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Merr mesazhet e testimit"</string>
+</resources>
diff --git a/res/values-mcc454-sr/strings.xml b/res/values-mcc454-sr/strings.xml
new file mode 100644
index 0000000..dd7e771
--- /dev/null
+++ b/res/values-mcc454-sr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Пробне поруке"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Пријем пробних порука"</string>
+</resources>
diff --git a/res/values-mcc454-sv/strings.xml b/res/values-mcc454-sv/strings.xml
new file mode 100644
index 0000000..3917236
--- /dev/null
+++ b/res/values-mcc454-sv/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Varning om allvarlig nödsituation"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Varning om nödsituation"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Testmeddelande"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Ta emot varningar vid nödsituationer"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Testmeddelanden"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Ta emot testmeddelanden"</string>
+</resources>
diff --git a/res/values-mcc454-sw/strings.xml b/res/values-mcc454-sw/strings.xml
new file mode 100644
index 0000000..45b82ac
--- /dev/null
+++ b/res/values-mcc454-sw/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Arifa za Dharura za Kupindukia"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Arifa ya Dharura"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Ujumbe wa Majaribio"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Pokea arifa za dharura"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Ujumbe wa majaribio"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Pokea ujumbe wa majaribio"</string>
+</resources>
diff --git a/res/values-mcc454-ta/strings.xml b/res/values-mcc454-ta/strings.xml
new file mode 100644
index 0000000..a3261a3
--- /dev/null
+++ b/res/values-mcc454-ta/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"சோதனை மெசேஜ்கள்"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"சோதனை மெசேஜ்களைப் பெறுக"</string>
+</resources>
diff --git a/res/values-mcc454-te/strings.xml b/res/values-mcc454-te/strings.xml
new file mode 100644
index 0000000..185b5a8
--- /dev/null
+++ b/res/values-mcc454-te/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"టెస్ట్ మెసేజ్‌లు"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"టెస్ట్ మెసేజ్‌లను అందుకోండి"</string>
+</resources>
diff --git a/res/values-mcc454-th/strings.xml b/res/values-mcc454-th/strings.xml
new file mode 100644
index 0000000..019ed68
--- /dev/null
+++ b/res/values-mcc454-th/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"ข้อความทดสอบ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"รับข้อความทดสอบ"</string>
+</resources>
diff --git a/res/values-mcc454-tl/strings.xml b/res/values-mcc454-tl/strings.xml
new file mode 100644
index 0000000..159b7aa
--- /dev/null
+++ b/res/values-mcc454-tl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Alerto sa Matinding Emergency"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Alerto sa Emergency"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Pansubok na Mensahe"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Makatanggap ng mga alerto sa emergency"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Mga pansubok na mensahe"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Makatanggap ng mga pansubok na mensahe"</string>
+</resources>
diff --git a/res/values-mcc454-tr/strings.xml b/res/values-mcc454-tr/strings.xml
new file mode 100644
index 0000000..6dc03f3
--- /dev/null
+++ b/res/values-mcc454-tr/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Olağanüstü Acil Durum Uyarısı"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Acil Durum Uyarısı"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Test Mesajı"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Acil durum uyarılarını al"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Test mesajları"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Test mesajlarını al"</string>
+</resources>
diff --git a/res/values-mcc454-uk/strings.xml b/res/values-mcc454-uk/strings.xml
new file mode 100644
index 0000000..f9c09d6
--- /dev/null
+++ b/res/values-mcc454-uk/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"Тестові повідомлення"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Отримання тестових повідомлень"</string>
+</resources>
diff --git a/res/values-mcc454-ur/strings.xml b/res/values-mcc454-ur/strings.xml
new file mode 100644
index 0000000..baa60b5
--- /dev/null
+++ b/res/values-mcc454-ur/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"ٹیسٹ پیغامات"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"ٹیسٹ پیغامات موصول کریں"</string>
+</resources>
diff --git a/res/values-mcc454-uz/strings.xml b/res/values-mcc454-uz/strings.xml
new file mode 100644
index 0000000..849f132
--- /dev/null
+++ b/res/values-mcc454-uz/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Juda muhim favqulodda ogohlantirish"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Favqulodda ogohlantirish"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Sinov xabari"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Favqulodda ogohlantirishlarni qabul qilish"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Sinov xabarlari"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Sinov xabarlarini olish"</string>
+</resources>
diff --git a/res/values-mcc454-vi/strings.xml b/res/values-mcc454-vi/strings.xml
new file mode 100644
index 0000000..fc78e96
--- /dev/null
+++ b/res/values-mcc454-vi/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Cảnh báo cực kỳ khẩn cấp"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Cảnh báo khẩn cấp"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Tin nhắn thử nghiệm"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Nhận cảnh báo khẩn cấp"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Tin nhắn thử nghiệm"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Nhận tin nhắn thử nghiệm"</string>
+</resources>
diff --git a/res/values-mcc454-zh-rCN/strings.xml b/res/values-mcc454-zh-rCN/strings.xml
new file mode 100644
index 0000000..83ef959
--- /dev/null
+++ b/res/values-mcc454-zh-rCN/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"测试消息"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"接收测试消息"</string>
+</resources>
diff --git a/res/values-mcc454-zh-rHK/strings.xml b/res/values-mcc454-zh-rHK/strings.xml
new file mode 100644
index 0000000..5511d36
--- /dev/null
+++ b/res/values-mcc454-zh-rHK/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"測試訊息"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"接收測試訊息"</string>
+</resources>
diff --git a/res/values-mcc454-zh-rTW/strings.xml b/res/values-mcc454-zh-rTW/strings.xml
new file mode 100644
index 0000000..5511d36
--- /dev/null
+++ b/res/values-mcc454-zh-rTW/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="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_cmas_test_alerts_title" msgid="4587011587057993053">"測試訊息"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"接收測試訊息"</string>
+</resources>
diff --git a/res/values-mcc454-zu/strings.xml b/res/values-mcc454-zu/strings.xml
new file mode 100644
index 0000000..75c6b50
--- /dev/null
+++ b/res/values-mcc454-zu/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_presidential_level_alert" msgid="8798462930675572592">"Isexwayiso Sesimo Esiphuthuma Kakhulu"</string>
+    <string name="cmas_extreme_alert" msgid="666310502927269524">"Isexwayiso Esiphuthumayo"</string>
+    <string name="cmas_required_monthly_test" msgid="3412608025684914213">"Umlayezo Wokuhlola"</string>
+    <string name="enable_emergency_alerts_message_summary" msgid="8186076761036041808">"Yamukela izexwayiso eziphuthumayo"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4587011587057993053">"Imilayezo yokuhlola"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="6148921520813876460">"Yamukela imilayezo yokuhlola"</string>
+</resources>
diff --git a/res/values-mcc454/config.xml b/res/values-mcc454/config.xml
index 782034c..e97321e 100644
--- a/res/values-mcc454/config.xml
+++ b/res/values-mcc454/config.xml
@@ -21,12 +21,15 @@
     <bool name="show_severe_alert_settings">false</bool>
     <!-- Whether enabling copy message text into clipboard by long press -->
     <bool name="enable_text_copy">false</bool>
+    <!-- Text links generating method. Hongkong does not allow text to be copied,
+    so we can't use smart linkify. -->
+    <string name="link_method" translatable="false">legacy_linkify</string>
 
     <!-- 4370, 4383 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, override_dnd=true</item>
+        <item>0x1112:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
         <!-- additional language -->
-        <item>0x111F:rat=gsm, emergency=true, override_dnd=true</item>
+        <item>0x111F:rat=gsm, emergency=true, override_dnd=true, always_on=true</item>
     </string-array>
 
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
@@ -44,9 +47,9 @@
     </string-array>
     <!-- 4380, 4393 -->
     <string-array name="required_monthly_test_range_strings" translatable="false">
-        <item>0x111C:rat=gsm, type=info, emergency=true</item>
+        <item>0x111C:rat=gsm, emergency=true</item>
         <!-- additional language -->
-        <item>0x1129:rat=gsm, type=info, emergency=true</item>
+        <item>0x1129:rat=gsm, emergency=true</item>
     </string-array>
     <string-array name="exercise_alert_range_strings" translatable="false"></string-array>
     <string-array name="operator_defined_alert_range_strings" translatable="false"></string-array>
diff --git a/res/values-mcc466-iw/strings.xml b/res/values-mcc466-iw/strings.xml
index 0fe2aae..6960ab4 100644
--- a/res/values-mcc466-iw/strings.xml
+++ b/res/values-mcc466-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="public_safety_message" msgid="4052407641316309322">"הודעת התרעה"</string>
+    <string name="public_safety_message" msgid="4052407641316309322">"הודאת התרעה"</string>
     <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"בדיקה חודשית נדרשת"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"קבלת הודעות בדיקה למערכת התרעות האבטחה"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"קבלת הודעות בדיקה למערכת התראות האבטחה"</string>
 </resources>
diff --git a/res/values-mcc466-mn/strings.xml b/res/values-mcc466-mn/strings.xml
index d220311..e518871 100644
--- a/res/values-mcc466-mn/strings.xml
+++ b/res/values-mcc466-mn/strings.xml
@@ -18,5 +18,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="4052407641316309322">"Мессеж сэрэмжлүүлэг"</string>
     <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"Сар тутам шаардлагатай туршилт"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"Аюулгүй байдлын сэрэмжлүүлгийн системийн туршилтын зурвас хүлээн авах"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"Аюулгүй байдлын сэрэмжлүүлгийн системийн туршилтын мессеж хүлээн авах"</string>
 </resources>
diff --git a/res/values-mcc466-ru/strings.xml b/res/values-mcc466-ru/strings.xml
index 97c7333..e117d64 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-mcc466-vi/strings.xml b/res/values-mcc466-vi/strings.xml
index d20509b..428d427 100644
--- a/res/values-mcc466-vi/strings.xml
+++ b/res/values-mcc466-vi/strings.xml
@@ -17,6 +17,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="4052407641316309322">"Thông báo cảnh báo"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"Kiểm tra hàng tháng bắt buộc"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="4165080207837566277">"Cần phải kiểm tra hằng tháng"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="1339769389077152402">"Nhận thông báo kiểm tra của hệ thống cảnh báo an toàn"</string>
 </resources>
diff --git a/res/values-mcc466/config.xml b/res/values-mcc466/config.xml
index a6a85aa..3cbcb0e 100644
--- a/res/values-mcc466/config.xml
+++ b/res/values-mcc466/config.xml
@@ -31,9 +31,9 @@
     </string-array>
     <!-- 4370, 4383 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true</item>
+        <item>0x1112:rat=gsm, emergency=true, always_on=true</item>
         <!-- additional language -->
-        <item>0x111F:rat=gsm, emergency=true</item>
+        <item>0x111F:rat=gsm, emergency=true, always_on=true</item>
     </string-array>
     <!--4371~4379, 4384~4392 -->
     <string-array name="emergency_alerts_channels_range_strings" translatable="false">
diff --git a/res/values-mcc505-mnc01/config.xml b/res/values-mcc505-mnc01/config.xml
deleted file mode 100644
index ce00c37..0000000
--- a/res/values-mcc505-mnc01/config.xml
+++ /dev/null
@@ -1,24 +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>
-</resources>
diff --git a/res/values-mcc505-mnc11/config.xml b/res/values-mcc505-mnc11/config.xml
deleted file mode 100644
index ce00c37..0000000
--- a/res/values-mcc505-mnc11/config.xml
+++ /dev/null
@@ -1,24 +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>
-</resources>
diff --git a/res/values-mcc505-mnc71/config.xml b/res/values-mcc505-mnc71/config.xml
deleted file mode 100644
index ce00c37..0000000
--- a/res/values-mcc505-mnc71/config.xml
+++ /dev/null
@@ -1,24 +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>
-</resources>
diff --git a/res/values-mcc505-mnc72/config.xml b/res/values-mcc505-mnc72/config.xml
deleted file mode 100644
index ce00c37..0000000
--- a/res/values-mcc505-mnc72/config.xml
+++ /dev/null
@@ -1,24 +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>
-</resources>
diff --git a/res/values-mcc530/config.xml b/res/values-mcc530/config.xml
index 2989482..9e5e927 100644
--- a/res/values-mcc530/config.xml
+++ b/res/values-mcc530/config.xml
@@ -17,10 +17,11 @@
 <resources>
     <!-- 4370 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, override_dnd=true</item>
+        <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-mcc530/strings.xml b/res/values-mcc530/strings.xml
index a2a292f..d177cf5 100644
--- a/res/values-mcc530/strings.xml
+++ b/res/values-mcc530/strings.xml
@@ -16,6 +16,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
            xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Special New Zealand requirement for the presidential alert toggle and description -->
+    <string name="enable_cmas_presidential_alerts_title">@string/enable_emergency_alerts_message_title</string>
+    <string name="enable_cmas_presidential_alerts_summary">@string/enable_emergency_alerts_message_summary</string>
     <!-- Special New Zealand requirement for the presidential alert title -->
     <string name="cmas_presidential_level_alert" translatable="false">@string/emergency_alert</string>
     <!-- CMAS dialog title for extreme alert. [CHAR LIMIT=50] -->
diff --git a/res/values-mcc655-mnc10-af/strings.xml b/res/values-mcc655-mnc10-af/strings.xml
new file mode 100644
index 0000000..1b9b3fb
--- /dev/null
+++ b/res/values-mcc655-mnc10-af/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Kanaal 50-waarskuwings"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Wys Kanaal 50-uitsendings in Suid-Afrika"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-am/strings.xml b/res/values-mcc655-mnc10-am/strings.xml
new file mode 100644
index 0000000..20cb741
--- /dev/null
+++ b/res/values-mcc655-mnc10-am/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"የChannel 50 ማንቂያዎች"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"በደቡብ አፍሪካ የChannel 50 ስርጭቶችን አሳይ"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ar/strings.xml b/res/values-mcc655-mnc10-ar/strings.xml
new file mode 100644
index 0000000..8640696
--- /dev/null
+++ b/res/values-mcc655-mnc10-ar/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"إظهار عمليات بثّ القناة 50 في جنوب إفريقيا"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-as/strings.xml b/res/values-mcc655-mnc10-as/strings.xml
new file mode 100644
index 0000000..6c61450
--- /dev/null
+++ b/res/values-mcc655-mnc10-as/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"চেনেল ৫০ সম্পৰ্কীয় সতৰ্কবাৰ্তা"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"দক্ষিণ আফ্ৰিকাত চেনেল ৫০ৰ সম্প্ৰচাৰসমূহ দেখুৱাওক"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-az/strings.xml b/res/values-mcc655-mnc10-az/strings.xml
new file mode 100644
index 0000000..08e7699
--- /dev/null
+++ b/res/values-mcc655-mnc10-az/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Kanal 50 xəbərdarlıqları"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Cənubi Afrikada kanal 50 yayımlarını göstərin"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-b+sr+Latn/strings.xml b/res/values-mcc655-mnc10-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..0114427
--- /dev/null
+++ b/res/values-mcc655-mnc10-b+sr+Latn/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Obaveštenja kanala 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Prikaži emitovanja kanala 50 u Južnoafričkoj Republici"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-be/strings.xml b/res/values-mcc655-mnc10-be/strings.xml
new file mode 100644
index 0000000..0e53f8f
--- /dev/null
+++ b/res/values-mcc655-mnc10-be/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"Паказваць трансляцыі канала 50 у Паўднёвай Афрыцы"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-bg/strings.xml b/res/values-mcc655-mnc10-bg/strings.xml
new file mode 100644
index 0000000..a00d020
--- /dev/null
+++ b/res/values-mcc655-mnc10-bg/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Сигнали за Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Показване на излъчванията на Channel 50 в Южна Африка"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-bn/strings.xml b/res/values-mcc655-mnc10-bn/strings.xml
new file mode 100644
index 0000000..c9ad380
--- /dev/null
+++ b/res/values-mcc655-mnc10-bn/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 সম্পর্কিত বিজ্ঞপ্তি"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"দক্ষিণ আফ্রিকাতে Channel 50 ব্রডকাস্ট দেখান"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-bs/strings.xml b/res/values-mcc655-mnc10-bs/strings.xml
new file mode 100644
index 0000000..15688d2
--- /dev/null
+++ b/res/values-mcc655-mnc10-bs/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Obavještenja kanala 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Prikaz emitiranja kanala 50 u Južnoj Africi"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ca/strings.xml b/res/values-mcc655-mnc10-ca/strings.xml
new file mode 100644
index 0000000..2dcceff
--- /dev/null
+++ b/res/values-mcc655-mnc10-ca/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alertes del canal 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Mostra les difusions del canal 50 a Sud-àfrica"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-cs/strings.xml b/res/values-mcc655-mnc10-cs/strings.xml
new file mode 100644
index 0000000..65bed69
--- /dev/null
+++ b/res/values-mcc655-mnc10-cs/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Upozornění na kanál 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Zobrazit vysílání na kanálu 50 v Jižní Africe"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-da/strings.xml b/res/values-mcc655-mnc10-da/strings.xml
new file mode 100644
index 0000000..cfa6183
--- /dev/null
+++ b/res/values-mcc655-mnc10-da/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Underretninger om Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Vis Channel 50-udsendelser i Sydafrika"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-de/strings.xml b/res/values-mcc655-mnc10-de/strings.xml
new file mode 100644
index 0000000..e251a5e
--- /dev/null
+++ b/res/values-mcc655-mnc10-de/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Benachrichtigungen von Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Benachrichtigungen von Channel 50 in Südafrika anzeigen"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-el/strings.xml b/res/values-mcc655-mnc10-el/strings.xml
new file mode 100644
index 0000000..efbfc6a
--- /dev/null
+++ b/res/values-mcc655-mnc10-el/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Ειδοποιήσεις Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Εμφάνιση μεταδόσεων από το Channel 50 στη Νότια Αφρική"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-en-rAU/strings.xml b/res/values-mcc655-mnc10-en-rAU/strings.xml
new file mode 100644
index 0000000..b28db3a
--- /dev/null
+++ b/res/values-mcc655-mnc10-en-rAU/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 alerts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Show channel 50 broadcasts in South Africa"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-en-rCA/strings.xml b/res/values-mcc655-mnc10-en-rCA/strings.xml
new file mode 100644
index 0000000..b28db3a
--- /dev/null
+++ b/res/values-mcc655-mnc10-en-rCA/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 alerts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Show channel 50 broadcasts in South Africa"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-en-rGB/strings.xml b/res/values-mcc655-mnc10-en-rGB/strings.xml
new file mode 100644
index 0000000..b28db3a
--- /dev/null
+++ b/res/values-mcc655-mnc10-en-rGB/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 alerts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Show channel 50 broadcasts in South Africa"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-en-rIN/strings.xml b/res/values-mcc655-mnc10-en-rIN/strings.xml
new file mode 100644
index 0000000..b28db3a
--- /dev/null
+++ b/res/values-mcc655-mnc10-en-rIN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 alerts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Show channel 50 broadcasts in South Africa"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-en-rXC/strings.xml b/res/values-mcc655-mnc10-en-rXC/strings.xml
new file mode 100644
index 0000000..f4aab92
--- /dev/null
+++ b/res/values-mcc655-mnc10-en-rXC/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎Channel 50 alerts‎‏‎‎‏‎"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‎Show channel 50 broadcasts in South Africa‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-es-rUS/strings.xml b/res/values-mcc655-mnc10-es-rUS/strings.xml
new file mode 100644
index 0000000..2c85459
--- /dev/null
+++ b/res/values-mcc655-mnc10-es-rUS/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alertas del Canal 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Mostrar emisiones del Canal 50 en Sudáfrica"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-es/strings.xml b/res/values-mcc655-mnc10-es/strings.xml
new file mode 100644
index 0000000..6951309
--- /dev/null
+++ b/res/values-mcc655-mnc10-es/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alertas de Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Mostrar alertas de Channel 50 en Sudáfrica"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-et/strings.xml b/res/values-mcc655-mnc10-et/strings.xml
new file mode 100644
index 0000000..ac49ddd
--- /dev/null
+++ b/res/values-mcc655-mnc10-et/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Kanal 50 teadaanded"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Kuva kanal 50 teadaanded Lõuna-Aafrika Vabariigis"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-eu/strings.xml b/res/values-mcc655-mnc10-eu/strings.xml
new file mode 100644
index 0000000..22e3e4c
--- /dev/null
+++ b/res/values-mcc655-mnc10-eu/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 kanalaren alertak"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Erakutsi Channel 50 kanalaren igorpenak Hego Afrikan"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-fa/strings.xml b/res/values-mcc655-mnc10-fa/strings.xml
new file mode 100644
index 0000000..fc6bad3
--- /dev/null
+++ b/res/values-mcc655-mnc10-fa/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"هشدارهای کانال ۵۰"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"نمایش همه‌فرستی‌های کانال ۵۰ در آفریقای جنوبی"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-fi/strings.xml b/res/values-mcc655-mnc10-fi/strings.xml
new file mode 100644
index 0000000..9b432fd
--- /dev/null
+++ b/res/values-mcc655-mnc10-fi/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Kanavan 50 ilmoitukset"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Näytä kanavan 50 lähetykset Etelä-Afrikassa"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-fr-rCA/strings.xml b/res/values-mcc655-mnc10-fr-rCA/strings.xml
new file mode 100644
index 0000000..da6caf8
--- /dev/null
+++ b/res/values-mcc655-mnc10-fr-rCA/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alertes du canal 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Afficher les diffusions du canal 50 en Afrique du Sud"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-fr/strings.xml b/res/values-mcc655-mnc10-fr/strings.xml
new file mode 100644
index 0000000..0666656
--- /dev/null
+++ b/res/values-mcc655-mnc10-fr/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alertes de la chaîne 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Afficher les diffusions de la chaîne 50 en Afrique du Sud"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-gl/strings.xml b/res/values-mcc655-mnc10-gl/strings.xml
new file mode 100644
index 0000000..1a58f17
--- /dev/null
+++ b/res/values-mcc655-mnc10-gl/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alertas de Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Mostra difusións de Channel 50 en Suráfrica"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-gu/strings.xml b/res/values-mcc655-mnc10-gu/strings.xml
new file mode 100644
index 0000000..436f3e7
--- /dev/null
+++ b/res/values-mcc655-mnc10-gu/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"દક્ષિણ આફ્રિકામાં ચૅનલ 50ના બ્રોડકાસ્ટ બતાવો"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-hi/strings.xml b/res/values-mcc655-mnc10-hi/strings.xml
new file mode 100644
index 0000000..8384228
--- /dev/null
+++ b/res/values-mcc655-mnc10-hi/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"दक्षिण अफ़्रीका में चैनल 50 के ब्रॉडकास्ट दिखाएं"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-hr/strings.xml b/res/values-mcc655-mnc10-hr/strings.xml
new file mode 100644
index 0000000..64c31b7
--- /dev/null
+++ b/res/values-mcc655-mnc10-hr/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Upozorenja kanala 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Prikaži emitiranja kanala 50 u Južnoafričkoj Republici"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-hu/strings.xml b/res/values-mcc655-mnc10-hu/strings.xml
new file mode 100644
index 0000000..78b38e2
--- /dev/null
+++ b/res/values-mcc655-mnc10-hu/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50-értesítések"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Channel 50-közvetítések megjelenítése Dél-Afrikában"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-hy/strings.xml b/res/values-mcc655-mnc10-hy/strings.xml
new file mode 100644
index 0000000..a705418
--- /dev/null
+++ b/res/values-mcc655-mnc10-hy/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Ծանուցումներ Channel 50-ի մասին"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Ցույց տալ Channel 50-ի հեռարձակումները Հարավային Աֆրիկայում"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-in/strings.xml b/res/values-mcc655-mnc10-in/strings.xml
new file mode 100644
index 0000000..80eeed3
--- /dev/null
+++ b/res/values-mcc655-mnc10-in/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Pemberitahuan Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Tampilkan Channel 50 yang disiarkan di Afrika Selatan"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-is/strings.xml b/res/values-mcc655-mnc10-is/strings.xml
new file mode 100644
index 0000000..727d160
--- /dev/null
+++ b/res/values-mcc655-mnc10-is/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 tilkynningar"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Sýna útsendingar Channel 50 í S-Afríku"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-it/strings.xml b/res/values-mcc655-mnc10-it/strings.xml
new file mode 100644
index 0000000..4e96b1c
--- /dev/null
+++ b/res/values-mcc655-mnc10-it/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Avvisi canale 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Mostra le trasmissioni del canale 50 in Sudafrica"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-iw/strings.xml b/res/values-mcc655-mnc10-iw/strings.xml
new file mode 100644
index 0000000..b536b92
--- /dev/null
+++ b/res/values-mcc655-mnc10-iw/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"הצגת שידורים של ערוץ 50 בדרום אפריקה"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ja/strings.xml b/res/values-mcc655-mnc10-ja/strings.xml
new file mode 100644
index 0000000..761bfdb
--- /dev/null
+++ b/res/values-mcc655-mnc10-ja/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 アラート"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"南アフリカの Channel 50 ブロードキャストを表示します"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ka/strings.xml b/res/values-mcc655-mnc10-ka/strings.xml
new file mode 100644
index 0000000..56c9693
--- /dev/null
+++ b/res/values-mcc655-mnc10-ka/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50-ის გაფრთხილებები"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Channel 50-ის ტრანსლაციების ჩვენება სამხრეთ აფრიკაში"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-kk/strings.xml b/res/values-mcc655-mnc10-kk/strings.xml
new file mode 100644
index 0000000..a6c8755
--- /dev/null
+++ b/res/values-mcc655-mnc10-kk/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 хабарландырулары"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Оңтүстік Африкадағы Channel 50 трансляциясын көрсету"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-km/strings.xml b/res/values-mcc655-mnc10-km/strings.xml
new file mode 100644
index 0000000..21e5222
--- /dev/null
+++ b/res/values-mcc655-mnc10-km/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"ការជូនដំណឹងពី Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"បង្ហាញការផ្សាយរបស់ channel 50 នៅអាហ្វ្រិកខាងត្បូង"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-kn/strings.xml b/res/values-mcc655-mnc10-kn/strings.xml
new file mode 100644
index 0000000..8f2bb2e
--- /dev/null
+++ b/res/values-mcc655-mnc10-kn/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"ದಕ್ಷಿಣ ಆಫ್ರಿಕಾದಲ್ಲಿ ಪ್ರಸಾರವಾಗುವ ಚಾನಲ್ 50 ಅನ್ನು ತೋರಿಸಿ"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ko/strings.xml b/res/values-mcc655-mnc10-ko/strings.xml
new file mode 100644
index 0000000..f06ab4f
--- /dev/null
+++ b/res/values-mcc655-mnc10-ko/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"남아프리카 공화국의 채널 50 방송 표시"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ky/strings.xml b/res/values-mcc655-mnc10-ky/strings.xml
new file mode 100644
index 0000000..08bb9eb
--- /dev/null
+++ b/res/values-mcc655-mnc10-ky/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"50 телеканалды Түштүк Африкада көрсөтүү"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-lo/strings.xml b/res/values-mcc655-mnc10-lo/strings.xml
new file mode 100644
index 0000000..25ea180
--- /dev/null
+++ b/res/values-mcc655-mnc10-lo/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"ສະແດງການສົ່ງຂໍ້ມູນເຕືອນໄພຈາກຊ່ອງ 50 ໃນອາຟຣິກາໃຕ້"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-lt/strings.xml b/res/values-mcc655-mnc10-lt/strings.xml
new file mode 100644
index 0000000..6a11514
--- /dev/null
+++ b/res/values-mcc655-mnc10-lt/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"„Channel 50“ įspėjimai"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Rodyti „Channel 50“ transliacijas Pietų Afrikoje"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-lv/strings.xml b/res/values-mcc655-mnc10-lv/strings.xml
new file mode 100644
index 0000000..b9fd66d
--- /dev/null
+++ b/res/values-mcc655-mnc10-lv/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 brīdinājumi"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Rādīt Channel 50 apraides Dienvidāfrikā"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-mk/strings.xml b/res/values-mcc655-mnc10-mk/strings.xml
new file mode 100644
index 0000000..9030469
--- /dev/null
+++ b/res/values-mcc655-mnc10-mk/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"Прикажувај мобилни преноси на каналот 50 во Јужна Африка"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ml/strings.xml b/res/values-mcc655-mnc10-ml/strings.xml
new file mode 100644
index 0000000..b951a34
--- /dev/null
+++ b/res/values-mcc655-mnc10-ml/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"ദക്ഷിണാഫ്രിക്കയിലെ ചാനൽ 50 ബ്രോഡ്‌കാസ്‌റ്റുകൾ കാണിക്കുക"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-mn/strings.xml b/res/values-mcc655-mnc10-mn/strings.xml
new file mode 100644
index 0000000..fbd9171
--- /dev/null
+++ b/res/values-mcc655-mnc10-mn/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"Өмнөд Америкт нэвтрүүлдэг 50-р сувгийг үзүүлэх"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-mr/strings.xml b/res/values-mcc655-mnc10-mr/strings.xml
new file mode 100644
index 0000000..f4b6082
--- /dev/null
+++ b/res/values-mcc655-mnc10-mr/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"चॅनल ५० च्या सूचना"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"दक्षिण आफ्रिकेमध्ये चॅनल ५० चे ब्रॉडकास्ट दाखवा"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ms/strings.xml b/res/values-mcc655-mnc10-ms/strings.xml
new file mode 100644
index 0000000..8b61d1b
--- /dev/null
+++ b/res/values-mcc655-mnc10-ms/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Makluman saluran 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Tunjukkan siaran saluran 50 di Afrika Selatan"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-my/strings.xml b/res/values-mcc655-mnc10-my/strings.xml
new file mode 100644
index 0000000..32253b5
--- /dev/null
+++ b/res/values-mcc655-mnc10-my/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 သတိပေးချက်များ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"တောင်အာဖရိကတွင် Channel 50 ထုတ်လွှင့်မှုများကို ပြသပါ"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-nb/strings.xml b/res/values-mcc655-mnc10-nb/strings.xml
new file mode 100644
index 0000000..5a87d64
--- /dev/null
+++ b/res/values-mcc655-mnc10-nb/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Varsler om kanal 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Vis kringkastinger på kanal 50 i Sør-Afrika"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ne/strings.xml b/res/values-mcc655-mnc10-ne/strings.xml
new file mode 100644
index 0000000..ed1f911
--- /dev/null
+++ b/res/values-mcc655-mnc10-ne/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 का प्रसारणसम्बन्धी अलर्टहरू"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"दक्षिण अफ्रिकामा Channel 50 का प्रसारणहरू देखाइयोस्"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-nl/strings.xml b/res/values-mcc655-mnc10-nl/strings.xml
new file mode 100644
index 0000000..57a95ff
--- /dev/null
+++ b/res/values-mcc655-mnc10-nl/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50-meldingen"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Channel 50-uitzendingen in Zuid-Afrika tonen"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-or/strings.xml b/res/values-mcc655-mnc10-or/strings.xml
new file mode 100644
index 0000000..8767962
--- /dev/null
+++ b/res/values-mcc655-mnc10-or/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"ଦକ୍ଷିଣ ଆଫ୍ରିକାରେ ଚ୍ୟାନେଲ୍ 50ର ବ୍ରଡକାଷ୍ଟଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-pa/strings.xml b/res/values-mcc655-mnc10-pa/strings.xml
new file mode 100644
index 0000000..e967df4
--- /dev/null
+++ b/res/values-mcc655-mnc10-pa/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"ਦੱਖਣੀ ਅਫ਼ਰੀਕਾ ਵਿੱਚ ਚੈਨਲ 50 ਦੇ ਪ੍ਰਸਾਰਨ ਦਿਖਾਓ"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-pl/strings.xml b/res/values-mcc655-mnc10-pl/strings.xml
new file mode 100644
index 0000000..974e285
--- /dev/null
+++ b/res/values-mcc655-mnc10-pl/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alerty na kanale 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Pokaż transmisje na kanale 50 w RPA"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-pt-rPT/strings.xml b/res/values-mcc655-mnc10-pt-rPT/strings.xml
new file mode 100644
index 0000000..02efa2b
--- /dev/null
+++ b/res/values-mcc655-mnc10-pt-rPT/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alertas do canal 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Mostre as transmissões do canal 50 na África do Sul."</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-pt/strings.xml b/res/values-mcc655-mnc10-pt/strings.xml
new file mode 100644
index 0000000..e8fcd51
--- /dev/null
+++ b/res/values-mcc655-mnc10-pt/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alertas do canal 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Mostrar transmissões do canal 50 na África do Sul"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ro/strings.xml b/res/values-mcc655-mnc10-ro/strings.xml
new file mode 100644
index 0000000..923d67c
--- /dev/null
+++ b/res/values-mcc655-mnc10-ro/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Alerte pentru Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Vedeți transmisiunile Channel 50 din Africa de Sud"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ru/strings.xml b/res/values-mcc655-mnc10-ru/strings.xml
new file mode 100644
index 0000000..cac4b23
--- /dev/null
+++ b/res/values-mcc655-mnc10-ru/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"Показывать оповещения широковещательной рассылки с использованием канала 50 в ЮАР."</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-si/strings.xml b/res/values-mcc655-mnc10-si/strings.xml
new file mode 100644
index 0000000..1306027
--- /dev/null
+++ b/res/values-mcc655-mnc10-si/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 ඇඟවීම්"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"දකුණු අප්‍රිකාවේ channel 50 විකාශ පෙන්වන්න"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-sk/strings.xml b/res/values-mcc655-mnc10-sk/strings.xml
new file mode 100644
index 0000000..5030265
--- /dev/null
+++ b/res/values-mcc655-mnc10-sk/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Upozornenia 50. kanála"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Zobrazovať vysielania 50. kanála v Južnej Afrike"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-sl/strings.xml b/res/values-mcc655-mnc10-sl/strings.xml
new file mode 100644
index 0000000..41f16c6
--- /dev/null
+++ b/res/values-mcc655-mnc10-sl/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Opozorila kanala 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Pokaži oddaje kanala 50 v Južni Afriki"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-sq/strings.xml b/res/values-mcc655-mnc10-sq/strings.xml
new file mode 100644
index 0000000..8816e82
--- /dev/null
+++ b/res/values-mcc655-mnc10-sq/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Sinjalizimet e Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Shfaq transmetimet e Channel 50 në Afrikën e Jugut"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-sr/strings.xml b/res/values-mcc655-mnc10-sr/strings.xml
new file mode 100644
index 0000000..76afbd1
--- /dev/null
+++ b/res/values-mcc655-mnc10-sr/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"Прикажи емитовања канала 50 у Јужноафричкој Републици"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-sv/strings.xml b/res/values-mcc655-mnc10-sv/strings.xml
new file mode 100644
index 0000000..dfee4eb
--- /dev/null
+++ b/res/values-mcc655-mnc10-sv/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Varningar från kanal 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Visa sändningar från kanal 50 i Sydafrika"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-sw/strings.xml b/res/values-mcc655-mnc10-sw/strings.xml
new file mode 100644
index 0000000..41b0c60
--- /dev/null
+++ b/res/values-mcc655-mnc10-sw/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Arifa za Channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Onyesha matangazo ya Channel 50 nchini Afrika Kusini"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ta/strings.xml b/res/values-mcc655-mnc10-ta/strings.xml
new file mode 100644
index 0000000..8b0c963
--- /dev/null
+++ b/res/values-mcc655-mnc10-ta/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"தென் ஆப்பிரிக்காவில் சேனல் 50 பிராட்காஸ்ட்களைக் காட்டு"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-te/strings.xml b/res/values-mcc655-mnc10-te/strings.xml
new file mode 100644
index 0000000..481d894
--- /dev/null
+++ b/res/values-mcc655-mnc10-te/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"దక్షిణాఫ్రికాలో ఛానెల్ 50 ప్రసారాలను చూపండి"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-th/strings.xml b/res/values-mcc655-mnc10-th/strings.xml
new file mode 100644
index 0000000..907952e
--- /dev/null
+++ b/res/values-mcc655-mnc10-th/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"แสดงการส่งข้อมูลเตือนภัยจากช่อง 50 ในแอฟริกาใต้"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-tl/strings.xml b/res/values-mcc655-mnc10-tl/strings.xml
new file mode 100644
index 0000000..ff776b2
--- /dev/null
+++ b/res/values-mcc655-mnc10-tl/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Mga alerto sa channel 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Ipakita ang mga broadcast ng channel 50 sa South Africa"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-tr/strings.xml b/res/values-mcc655-mnc10-tr/strings.xml
new file mode 100644
index 0000000..2567ea1
--- /dev/null
+++ b/res/values-mcc655-mnc10-tr/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 uyarıları"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Güney Afrika\'daki Channel 50 yayınını göster"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-uk/strings.xml b/res/values-mcc655-mnc10-uk/strings.xml
new file mode 100644
index 0000000..2003b45
--- /dev/null
+++ b/res/values-mcc655-mnc10-uk/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"Показувати сповіщення каналу 50 у Південно-Африканській Республіці"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-ur/strings.xml b/res/values-mcc655-mnc10-ur/strings.xml
new file mode 100644
index 0000000..bf5f616
--- /dev/null
+++ b/res/values-mcc655-mnc10-ur/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- 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_summary" msgid="4769414683505720325">"جنوبی افریقہ میں چینل 50 کے براڈکاسٹس دکھائیں"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-uz/strings.xml b/res/values-mcc655-mnc10-uz/strings.xml
new file mode 100644
index 0000000..ab25009
--- /dev/null
+++ b/res/values-mcc655-mnc10-uz/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 ogohlantirishlari"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Janubiy Afrikada Channel 50 translatsiyalarini chiqarish"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-vi/strings.xml b/res/values-mcc655-mnc10-vi/strings.xml
new file mode 100644
index 0000000..a437c22
--- /dev/null
+++ b/res/values-mcc655-mnc10-vi/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Thông báo trên kênh 50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Hiện tin truyền phát trên kênh 50 ở Nam Phi"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-zh-rCN/strings.xml b/res/values-mcc655-mnc10-zh-rCN/strings.xml
new file mode 100644
index 0000000..cd15568
--- /dev/null
+++ b/res/values-mcc655-mnc10-zh-rCN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 警报"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"显示南非的 Channel 50 广播"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-zh-rHK/strings.xml b/res/values-mcc655-mnc10-zh-rHK/strings.xml
new file mode 100644
index 0000000..6067865
--- /dev/null
+++ b/res/values-mcc655-mnc10-zh-rHK/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 警示"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"顯示南非地區的 Channel 50 廣播"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-zh-rTW/strings.xml b/res/values-mcc655-mnc10-zh-rTW/strings.xml
new file mode 100644
index 0000000..28667b1
--- /dev/null
+++ b/res/values-mcc655-mnc10-zh-rTW/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Channel 50 警報"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"顯示南非地區的 Channel 50 廣播訊息"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10-zu/strings.xml b/res/values-mcc655-mnc10-zu/strings.xml
new file mode 100644
index 0000000..9a95516
--- /dev/null
+++ b/res/values-mcc655-mnc10-zu/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- no translation found for pws_other_message_identifiers (8386631538547583365) -->
+    <skip />
+    <string name="enable_area_update_info_alerts_title" msgid="359971597213074452">"Izexwayiso zesiteshi esingama-50"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="4769414683505720325">"Bonisa ukusakaza kwesiteshi esingama-50 e-South Africa"</string>
+</resources>
diff --git a/res/values-mcc655-mnc10/config.xml b/res/values-mcc655-mnc10/config.xml
index 160dd12..0356f43 100644
--- a/res/values-mcc655-mnc10/config.xml
+++ b/res/values-mcc655-mnc10/config.xml
@@ -18,12 +18,25 @@
     <!-- Channel 50. Even though it's for non-emergency, we mark it as
          emergency here so the dialog will pop-up. -->
     <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0x032:type=area, emergency=true</item>
+        <item>0x032:type=area, emergency=true, display_icon=false</item>
     </string-array>
+    <!-- Whether to show main switch settings at the top -->
+    <bool name="show_main_switch_settings">false</bool>
 
     <!-- This is a special case that channel 50 is used as a regular message channel -->
     <bool name="config_showAreaUpdateInfoSettings">true</bool>
 
     <!-- Area info toggle default value -->
     <bool name="area_update_info_alerts_enabled_default">false</bool>
+
+    <!-- Disable other emergency alerts -->
+    <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false"></string-array>
+    <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
+    <string-array name="cmas_alerts_severe_range_strings" translatable="false"></string-array>
+    <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"></string-array>
+    <string-array name="required_monthly_test_range_strings" translatable="false"></string-array>
+    <string-array name="exercise_alert_range_strings" translatable="false"></string-array>
+    <string-array name="operator_defined_alert_range_strings" translatable="false"></string-array>
+    <string-array name="etws_test_alerts_range_strings" translatable="false"></string-array>
+    <string-array name="etws_alerts_range_strings" translatable="false"></string-array>
 </resources>
diff --git a/res/values-mcc655-mnc10/strings.xml b/res/values-mcc655-mnc10/strings.xml
index 689fa68..e2b9d1a 100644
--- a/res/values-mcc655-mnc10/strings.xml
+++ b/res/values-mcc655-mnc10/strings.xml
@@ -18,4 +18,8 @@
            xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Display cell broadcasts for messages -->
     <string name="pws_other_message_identifiers">@string/cb_other_message_identifiers</string>
+    <!-- Preference title for enable area update information broadcasts. [CHAR LIMIT=50] -->
+    <string name="enable_area_update_info_alerts_title">Channel 50 alerts</string>
+    <!-- Preference summary for enable area update information broadcasts. [CHAR LIMIT=100] -->
+    <string name="enable_area_update_info_alerts_summary">Show channel 50 broadcasts in South Africa</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-mcc716-af/strings.xml b/res/values-mcc716-af/strings.xml
index ecbe37c..1116c40 100644
--- a/res/values-mcc716-af/strings.xml
+++ b/res/values-mcc716-af/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Noodberig: Toetsboodskap"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Noodwaarskuwing: Oefening-/drilboodskap"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Noodwaarskuwing: Toetsboodskap"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Versteek"</string>
 </resources>
diff --git a/res/values-mcc716-am/strings.xml b/res/values-mcc716-am/strings.xml
index f331305..1dd73fc 100644
--- a/res/values-mcc716-am/strings.xml
+++ b/res/values-mcc716-am/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"የአደጋ ጊዜ ማንቂያ፦ የሙከራ መልዕክት"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"የድንገተኛ አደጋ ማስጠንቀቂያ፦ ልምምድ/አብነታዊ ልምምድ መልዕክት"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"የአደጋ ጊዜ ማንቂያ፦ የሙከራ መልዕክት"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"ደብቅ"</string>
 </resources>
diff --git a/res/values-mcc716-ar/strings.xml b/res/values-mcc716-ar/strings.xml
index 0f5435b..51c36ab 100644
--- a/res/values-mcc716-ar/strings.xml
+++ b/res/values-mcc716-ar/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"إنذار الطوارئ: رسالة اختبارية"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"تنبيه الطوارئ: رسالة تدريبية/تجريبية"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"تنبيه الطوارئ: رسالة اختبارية"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"إخفاء"</string>
 </resources>
diff --git a/res/values-mcc716-as/strings.xml b/res/values-mcc716-as/strings.xml
index 38d9f45..d2d81d7 100644
--- a/res/values-mcc716-as/strings.xml
+++ b/res/values-mcc716-as/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"জৰুৰীকালীন সতৰ্কবাণী: পৰীক্ষামূলক বাৰ্তা"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"জৰুৰীকালীন সতর্কবার্তা: অনুশীলন/ড্ৰিলৰ সতর্কবার্তা"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"জৰুৰীকালীন সতৰ্কবার্তা: পৰীক্ষামূলক বাৰ্তা"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"লুকুৱাওক"</string>
 </resources>
diff --git a/res/values-mcc716-az/strings.xml b/res/values-mcc716-az/strings.xml
index a3716fc..5fb4842 100644
--- a/res/values-mcc716-az/strings.xml
+++ b/res/values-mcc716-az/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Mühüm bildiriş: Test mesajı"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Fövqəladə siqnal: Tapşırıq/Yığıncaq mesajı"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Fövqəladə siqnal: Test mesajı"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Gizlədin"</string>
 </resources>
diff --git a/res/values-mcc716-b+sr+Latn/strings.xml b/res/values-mcc716-b+sr+Latn/strings.xml
index 9c9ba6f..adf15ee 100644
--- a/res/values-mcc716-b+sr+Latn/strings.xml
+++ b/res/values-mcc716-b+sr+Latn/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Obaveštenje o hitnom slučaju: probna poruka"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Upozorenje o hitnom slučaju: poruka za vežbu"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Upozorenje o hitnom slučaju: probna poruka"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Sakrij"</string>
 </resources>
diff --git a/res/values-mcc716-be/strings.xml b/res/values-mcc716-be/strings.xml
index 484c062..d8b9098 100644
--- a/res/values-mcc716-be/strings.xml
+++ b/res/values-mcc716-be/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Абвестка аб надзвычайнай сітуацыі: тэставае паведамленне"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Абвестка аб надзвычайнай сітуацыі: вучэбнае/трэніровачнае паведамленне"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Абвестка аб надзвычайнай сітуацыі: тэставае паведамленне"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Схаваць"</string>
 </resources>
diff --git a/res/values-mcc716-bg/strings.xml b/res/values-mcc716-bg/strings.xml
index 1f1d842..d6faa9d 100644
--- a/res/values-mcc716-bg/strings.xml
+++ b/res/values-mcc716-bg/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Сигнал при спешни случаи: Тестово съобщение"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Сигнал при спешни случаи: Съобщение за провеждане на учение/тренировка"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Сигнал при спешни случаи: Тестово съобщение"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Скриване"</string>
 </resources>
diff --git a/res/values-mcc716-bn/strings.xml b/res/values-mcc716-bn/strings.xml
index 09e062d..9e9a521 100644
--- a/res/values-mcc716-bn/strings.xml
+++ b/res/values-mcc716-bn/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"জরুরি সতর্কতা: পরীক্ষামূলক মেসেজ"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"জরুরি সতর্কতা: এক্সারসাইজ/ড্রিল মেসেজ"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"জরুরি সতর্কতা: পরীক্ষামূলক মেসেজ"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"লুকান"</string>
 </resources>
diff --git a/res/values-mcc716-bs/strings.xml b/res/values-mcc716-bs/strings.xml
index a4d0d23..3428b2d 100644
--- a/res/values-mcc716-bs/strings.xml
+++ b/res/values-mcc716-bs/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Upozorenje za vanredne situacije: testna poruka"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Upozorenje za vanredne situacije: poruka za vježbu"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Upozorenje za vanredne situacije: testna poruka"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Sakrij"</string>
 </resources>
diff --git a/res/values-mcc716-ca/strings.xml b/res/values-mcc716-ca/strings.xml
index 5eca521..cf22324 100644
--- a/res/values-mcc716-ca/strings.xml
+++ b/res/values-mcc716-ca/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta d\'emergències: missatge de prova"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerta d\'emergències: missatge de simulacre o pràctica"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerta d\'emergències: missatge de prova"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Amaga"</string>
 </resources>
diff --git a/res/values-mcc716-cs/strings.xml b/res/values-mcc716-cs/strings.xml
index 7ca9f90..6349e57 100644
--- a/res/values-mcc716-cs/strings.xml
+++ b/res/values-mcc716-cs/strings.xml
@@ -18,7 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Informativní zpráva"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Informativní zpráva"</string>
-    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Nouzová výstraha: testovací zpráva"</string>
-    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Nouzová výstraha: testovací zpráva / cvičení"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Nouzová výstraha: testovací zpráva"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Výstražná zpráva: testovací zpráva"</string>
+    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Výstražná zpráva: testovací zpráva / cvičení"</string>
+    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Výstražná zpráva: testovací zpráva"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Skrýt"</string>
 </resources>
diff --git a/res/values-mcc716-da/strings.xml b/res/values-mcc716-da/strings.xml
index be30b23..458a629 100644
--- a/res/values-mcc716-da/strings.xml
+++ b/res/values-mcc716-da/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Nødalarm: Testmeddelelse"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Nødalarm: Øvelsesmeddelelse"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Nødalarm: Testmeddelelse"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Skjul"</string>
 </resources>
diff --git a/res/values-mcc716-de/strings.xml b/res/values-mcc716-de/strings.xml
index e5771a5..81d5ed4 100644
--- a/res/values-mcc716-de/strings.xml
+++ b/res/values-mcc716-de/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Notfallbenachrichtigung: Testnachricht"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Notfallbenachrichtigung: Übungsnachricht"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Notfallbenachrichtigung: Testnachricht"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ausblenden"</string>
 </resources>
diff --git a/res/values-mcc716-el/strings.xml b/res/values-mcc716-el/strings.xml
index faee8df..64fa198 100644
--- a/res/values-mcc716-el/strings.xml
+++ b/res/values-mcc716-el/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Ειδοποίηση έκτακτης ανάγκης: Δοκιμαστικό μήνυμα"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Ειδοποίηση έκτακτης ανάγκης: Μήνυμα άσκησης/γυμνασίου"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Ειδοποίηση έκτακτης ανάγκης: Δοκιμαστικό μήνυμα"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Απόκρυψη"</string>
 </resources>
diff --git a/res/values-mcc716-en-rAU/strings.xml b/res/values-mcc716-en-rAU/strings.xml
index b17d6f9..334aa9d 100644
--- a/res/values-mcc716-en-rAU/strings.xml
+++ b/res/values-mcc716-en-rAU/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Emergency alert: test message"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Emergency alert: Exercise/Drill message"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Emergency alert: Test message"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Hide"</string>
 </resources>
diff --git a/res/values-mcc716-en-rCA/strings.xml b/res/values-mcc716-en-rCA/strings.xml
index b17d6f9..334aa9d 100644
--- a/res/values-mcc716-en-rCA/strings.xml
+++ b/res/values-mcc716-en-rCA/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Emergency alert: test message"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Emergency alert: Exercise/Drill message"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Emergency alert: Test message"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Hide"</string>
 </resources>
diff --git a/res/values-mcc716-en-rGB/strings.xml b/res/values-mcc716-en-rGB/strings.xml
index b17d6f9..334aa9d 100644
--- a/res/values-mcc716-en-rGB/strings.xml
+++ b/res/values-mcc716-en-rGB/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Emergency alert: test message"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Emergency alert: Exercise/Drill message"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Emergency alert: Test message"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Hide"</string>
 </resources>
diff --git a/res/values-mcc716-en-rIN/strings.xml b/res/values-mcc716-en-rIN/strings.xml
index b17d6f9..334aa9d 100644
--- a/res/values-mcc716-en-rIN/strings.xml
+++ b/res/values-mcc716-en-rIN/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Emergency alert: test message"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Emergency alert: Exercise/Drill message"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Emergency alert: Test message"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Hide"</string>
 </resources>
diff --git a/res/values-mcc716-en-rXC/strings.xml b/res/values-mcc716-en-rXC/strings.xml
index 84ff76e..e8b5ec6 100644
--- a/res/values-mcc716-en-rXC/strings.xml
+++ b/res/values-mcc716-en-rXC/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‎Emergency alert: Test message‎‏‎‎‏‎"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎Emergency alert: Exercise/Drill message‎‏‎‎‏‎"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‎Emergency alert: Test message‎‏‎‎‏‎"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎Hide‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-mcc716-es-rUS/strings.xml b/res/values-mcc716-es-rUS/strings.xml
index fb3b1c3..1629df7 100644
--- a/res/values-mcc716-es-rUS/strings.xml
+++ b/res/values-mcc716-es-rUS/strings.xml
@@ -21,4 +21,5 @@
     <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="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 a72b813..7912091 100644
--- a/res/values-mcc716-es/strings.xml
+++ b/res/values-mcc716-es/strings.xml
@@ -19,6 +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 simulacro o práctica"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"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="button_dismiss" msgid="5823921161712171097">"Ocultar"</string>
 </resources>
diff --git a/res/values-mcc716-et/strings.xml b/res/values-mcc716-et/strings.xml
index 26f222e..0fb1782 100644
--- a/res/values-mcc716-et/strings.xml
+++ b/res/values-mcc716-et/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Hädaolukorra märguanne: testsõnum"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Hädaolukorra märguanne: treeningsõnum"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Hädaolukorra märguanne: testsõnum"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Peida"</string>
 </resources>
diff --git a/res/values-mcc716-eu/strings.xml b/res/values-mcc716-eu/strings.xml
index 06b8c4f..5d289e4 100644
--- a/res/values-mcc716-eu/strings.xml
+++ b/res/values-mcc716-eu/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Larrialdi-alerta: probako mezua"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Larrialdi-alerta: ariketa/proba motako mezua"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Larrialdi-alerta: probako mezua"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ezkutatu"</string>
 </resources>
diff --git a/res/values-mcc716-fa/strings.xml b/res/values-mcc716-fa/strings.xml
index 14241fa..abd870b 100644
--- a/res/values-mcc716-fa/strings.xml
+++ b/res/values-mcc716-fa/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"هشدار اضطراری: پیام آزمایشی"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"هشدار اضطراری: پیام آزمایشی/تمرینی"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"هشدار اضطراری: پیام آزمایشی"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"پنهان کردن"</string>
 </resources>
diff --git a/res/values-mcc716-fi/strings.xml b/res/values-mcc716-fi/strings.xml
index 15902fa..3ec4eb4 100644
--- a/res/values-mcc716-fi/strings.xml
+++ b/res/values-mcc716-fi/strings.xml
@@ -18,7 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="public_safety_message" msgid="7237115648380675159">"Hyödyllinen viesti"</string>
     <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Hyödylliset viestit"</string>
-    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Hätähälytys: koeviesti"</string>
-    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Hätähälytys: harjoitusviesti"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Hätähälytys: koeviesti"</string>
+    <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Vaaratiedote: testiviesti"</string>
+    <string name="cmas_exercise_alert" msgid="3061507852301643814">"Vaaratiedote: harjoitusviesti"</string>
+    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Vaaratiedote: testiviesti"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Piilota"</string>
 </resources>
diff --git a/res/values-mcc716-fr-rCA/strings.xml b/res/values-mcc716-fr-rCA/strings.xml
index 29deedf..578ae03 100644
--- a/res/values-mcc716-fr-rCA/strings.xml
+++ b/res/values-mcc716-fr-rCA/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerte d\'urgence : message test"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerte d’urgence : message d\'exercice"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerte d\'urgence : message test"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Masquer"</string>
 </resources>
diff --git a/res/values-mcc716-fr/strings.xml b/res/values-mcc716-fr/strings.xml
index 08507d4..316150a 100644
--- a/res/values-mcc716-fr/strings.xml
+++ b/res/values-mcc716-fr/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerte d\'urgence : message test"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerte d\'urgence : message d\'exercice/de simulation"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerte d\'urgence : message test"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Masquer"</string>
 </resources>
diff --git a/res/values-mcc716-gl/strings.xml b/res/values-mcc716-gl/strings.xml
index 55bb9b8..424a2ba 100644
--- a/res/values-mcc716-gl/strings.xml
+++ b/res/values-mcc716-gl/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emerxencia: mensaxe de proba"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerta de emerxencia: mensaxe de simulacro/simulación"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerta de emerxencia: mensaxe de proba"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ocultar"</string>
 </resources>
diff --git a/res/values-mcc716-gu/strings.xml b/res/values-mcc716-gu/strings.xml
index 1b2f892..c29f48a 100644
--- a/res/values-mcc716-gu/strings.xml
+++ b/res/values-mcc716-gu/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"કટોકટીની ચેતવણી: પરીક્ષણ સંદેશ"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"ઇમર્જન્સી અલર્ટ: કસરત/વ્યાયામ સંબંધિત સંદેશ"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"ઇમર્જન્સી અલર્ટ: પરીક્ષણ સંદેશ"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"છુપાવો"</string>
 </resources>
diff --git a/res/values-mcc716-hi/strings.xml b/res/values-mcc716-hi/strings.xml
index cd37ae2..e7d355e 100644
--- a/res/values-mcc716-hi/strings.xml
+++ b/res/values-mcc716-hi/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"आपातकालीन अलर्ट: टेस्ट मैसेज"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"आपातकालीन अलर्ट: एक्सरसाइज़/ड्रिल मैसेज"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"आपातकालीन अलर्ट: टेस्ट मैसेज"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"छिपाएं"</string>
 </resources>
diff --git a/res/values-mcc716-hr/strings.xml b/res/values-mcc716-hr/strings.xml
index 17bd8c4..09ec48d 100644
--- a/res/values-mcc716-hr/strings.xml
+++ b/res/values-mcc716-hr/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Hitno upozorenje: testna poruka"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Hitno upozorenje: poruka za vježbu"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Hitno upozorenje: testna poruka"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Sakrij"</string>
 </resources>
diff --git a/res/values-mcc716-hu/strings.xml b/res/values-mcc716-hu/strings.xml
index 7c020fe..ee7b2d4 100644
--- a/res/values-mcc716-hu/strings.xml
+++ b/res/values-mcc716-hu/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Vészjelzés: Tesztüzenet"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Vészjelzés: Gyakorlati/próbaüzenet"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Vészjelzés: Tesztüzenet"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Elrejtés"</string>
 </resources>
diff --git a/res/values-mcc716-hy/strings.xml b/res/values-mcc716-hy/strings.xml
index 32cc610..2d64270 100644
--- a/res/values-mcc716-hy/strings.xml
+++ b/res/values-mcc716-hy/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Արտակարգ իրավիճակի զգուշացում՝ փորձնական ահազանգ"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Արտակարգ իրավիճակի ահազանգ՝ ուսումնավարժական հաղորդագրություն"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Արտակարգ իրավիճակի զգուշացում՝ փորձնական ահազանգ"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Թաքցնել"</string>
 </resources>
diff --git a/res/values-mcc716-in/strings.xml b/res/values-mcc716-in/strings.xml
index e5c1913..f9fd074 100644
--- a/res/values-mcc716-in/strings.xml
+++ b/res/values-mcc716-in/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Peringatan darurat: Pesan percobaan"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Peringatan darurat: Pesan Latihan"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Peringatan darurat: Pesan percobaan"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Sembunyikan"</string>
 </resources>
diff --git a/res/values-mcc716-is/strings.xml b/res/values-mcc716-is/strings.xml
index 586cae6..14b73c7 100644
--- a/res/values-mcc716-is/strings.xml
+++ b/res/values-mcc716-is/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Neyðarviðvörun: Prufuskilaboð"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Neyðarviðvörun: æfinga-/prufuviðvörun"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Neyðarviðvörun: prufuskilaboð"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Fela"</string>
 </resources>
diff --git a/res/values-mcc716-it/strings.xml b/res/values-mcc716-it/strings.xml
index aabcca4..3e8b3d5 100644
--- a/res/values-mcc716-it/strings.xml
+++ b/res/values-mcc716-it/strings.xml
@@ -21,4 +21,5 @@
     <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="button_dismiss" msgid="5823921161712171097">"Nascondi"</string>
 </resources>
diff --git a/res/values-mcc716-iw/strings.xml b/res/values-mcc716-iw/strings.xml
index 2115eb8..38fff63 100644
--- a/res/values-mcc716-iw/strings.xml
+++ b/res/values-mcc716-iw/strings.xml
@@ -18,7 +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_exercise_alert" msgid="3061507852301643814">"התרעה על מקרה חירום: הודעת תרגול/ניסיון"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"התרעה על מקרי חירום: הודעת בדיקה"</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="button_dismiss" msgid="5823921161712171097">"הסתרה"</string>
 </resources>
diff --git a/res/values-mcc716-ja/strings.xml b/res/values-mcc716-ja/strings.xml
index ea872bd..26d0bcb 100644
--- a/res/values-mcc716-ja/strings.xml
+++ b/res/values-mcc716-ja/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"緊急速報メール: テスト メッセージ"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"緊急速報メール: 訓練用メッセージ"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"緊急速報メール: テスト メッセージ"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"非表示にする"</string>
 </resources>
diff --git a/res/values-mcc716-ka/strings.xml b/res/values-mcc716-ka/strings.xml
index 632ddf0..1826395 100644
--- a/res/values-mcc716-ka/strings.xml
+++ b/res/values-mcc716-ka/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"გაფრთხილება საგანგებო ვითარების შესახებ: სატესტო შეტყობინება"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"გაფრთხილება საგანგებო ვითარების შესახებ: სავარჯიშო შეტყობინება"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"გაფრთხილება საგანგებო ვითარების შესახებ: სატესტო შეტყობინება"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"დამალვა"</string>
 </resources>
diff --git a/res/values-mcc716-kk/strings.xml b/res/values-mcc716-kk/strings.xml
index 46e6827..9f2fd54 100644
--- a/res/values-mcc716-kk/strings.xml
+++ b/res/values-mcc716-kk/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Төтенше жағдай туралы ескерту: тексеру хабары"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Төтенше жағдай хабарландыруы: оқу/жаттығу хабары"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Төтенше жағдай хабарландыруы: тексеру хабары"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Жасыру"</string>
 </resources>
diff --git a/res/values-mcc716-km/strings.xml b/res/values-mcc716-km/strings.xml
index 8846d52..e1d64ce 100644
--- a/res/values-mcc716-km/strings.xml
+++ b/res/values-mcc716-km/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន៖ សារសាកល្បង"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"ការជូនដំណឹង​ពេលអាសន្ន៖ សារនៃ​ការអនុវត្ត/ការហ្វឹកហាត់"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"ការជូនដំណឹង​ពេលអាសន្ន៖ សារសាកល្បង"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"លាក់"</string>
 </resources>
diff --git a/res/values-mcc716-kn/strings.xml b/res/values-mcc716-kn/strings.xml
index e8ceb67..388be40 100644
--- a/res/values-mcc716-kn/strings.xml
+++ b/res/values-mcc716-kn/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ತುರ್ತು ಎಚ್ಚರಿಕೆ: ಪರಿಕ್ಷಾ ಸಂದೇಶ"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"ತುರ್ತು ಎಚ್ಚರಿಕೆ: ಪ್ರಾಯೋಗಿಕ/ಪ್ರಾತ್ಯಕ್ಷಿಕೆ ಕುರಿತಾದ ಸಂದೇಶ"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"ತುರ್ತು ಎಚ್ಚರಿಕೆ: ಪರೀಕ್ಷಾ ಸಂದೇಶ"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"ಮರೆಮಾಡಿ"</string>
 </resources>
diff --git a/res/values-mcc716-ko/strings.xml b/res/values-mcc716-ko/strings.xml
index ed3f635..d9a2a41 100644
--- a/res/values-mcc716-ko/strings.xml
+++ b/res/values-mcc716-ko/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"비상사태 경고: 테스트 메시지"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"비상사태 경고: 훈련 메시지"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"비상사태 경고: 테스트 메시지"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"숨기기"</string>
 </resources>
diff --git a/res/values-mcc716-ky/strings.xml b/res/values-mcc716-ky/strings.xml
index 55af542..109bbab 100644
--- a/res/values-mcc716-ky/strings.xml
+++ b/res/values-mcc716-ky/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Өзгөчө кырдаал жөнүндө шашылыш билдирүү: Сынамык"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Шашылыш билдирүү: Көнүгүү билдирүүсү"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Шашылыш билдирүү: Сынамык"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Жашыруу"</string>
 </resources>
diff --git a/res/values-mcc716-lo/strings.xml b/res/values-mcc716-lo/strings.xml
index 13df570..4f0b1cb 100644
--- a/res/values-mcc716-lo/strings.xml
+++ b/res/values-mcc716-lo/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ການເຕືອນສຸກເສີນ: ຂໍ້ຄວາມທົດສອບ"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"ການເຕືອນສຸກເສີນ: ຂໍ້ຄວາມທົດສອບ/ເຝິກຊ້ອມ"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"ການເຕືອນສຸກເສີນ: ຂໍ້ຄວາມທົດສອບ"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"ເຊື່ອງ"</string>
 </resources>
diff --git a/res/values-mcc716-lt/strings.xml b/res/values-mcc716-lt/strings.xml
index d0eeac4..f7de560 100644
--- a/res/values-mcc716-lt/strings.xml
+++ b/res/values-mcc716-lt/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Nepaprastosios padėties įspėjimas: bandomasis pranešimas"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Kritinės padėties įspėjimas: mokomasis pranešimas"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Kritinės padėties įspėjimas: bandomasis pranešimas"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Slėpti"</string>
 </resources>
diff --git a/res/values-mcc716-lv/strings.xml b/res/values-mcc716-lv/strings.xml
index 3c9d53d..e5f2ad0 100644
--- a/res/values-mcc716-lv/strings.xml
+++ b/res/values-mcc716-lv/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Ārkārtas situācijas brīdinājums: pārbaudes ziņojums"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Ārkārtas situācijas brīdinājums: vingrinājuma/simulācijas ziņojums"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Ārkārtas situācijas brīdinājums: pārbaudes ziņojums"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Paslēpt"</string>
 </resources>
diff --git a/res/values-mcc716-mk/strings.xml b/res/values-mcc716-mk/strings.xml
index 46b1b1a..bec3cb0 100644
--- a/res/values-mcc716-mk/strings.xml
+++ b/res/values-mcc716-mk/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Предупредување за итни случаи: тест порака"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Предупредување за итни случаи: порака за вежба/обука"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Предупредување за итни случаи: тест-порака"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Сокриј"</string>
 </resources>
diff --git a/res/values-mcc716-ml/strings.xml b/res/values-mcc716-ml/strings.xml
index cf6c3d8..749d0c9 100644
--- a/res/values-mcc716-ml/strings.xml
+++ b/res/values-mcc716-ml/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"അടിയന്തര മുന്നറിയിപ്പ്: പരീക്ഷണ സന്ദേശം"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"അടിയന്തര മുന്നറിയിപ്പ്: പരിശീലന/ഡ്രിൽ സന്ദേശം"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"അടിയന്തര മുന്നറിയിപ്പ്: പരീക്ഷണ സന്ദേശം"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"മറയ്ക്കുക"</string>
 </resources>
diff --git a/res/values-mcc716-mn/strings.xml b/res/values-mcc716-mn/strings.xml
index a3d1f63..fd0da24 100644
--- a/res/values-mcc716-mn/strings.xml
+++ b/res/values-mcc716-mn/strings.xml
@@ -16,9 +16,10 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="public_safety_message" msgid="7237115648380675159">"Мэдээллийн зурвас"</string>
-    <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Мэдээллийн зурвас"</string>
+    <string name="public_safety_message" msgid="7237115648380675159">"Мэдээллийн мессеж"</string>
+    <string name="enable_public_safety_messages_title" msgid="4037404034274507696">"Мэдээллийн мессеж"</string>
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Яаралтай сэрэмжлүүлэг: Туршилтын мессеж"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Онцгой байдлын сэрэмжлүүлэг: Сургуулилалт/Сургалтын мессеж"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Онцгой байдлын сэрэмжлүүлэг: Туршилтын мессеж"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Нуух"</string>
 </resources>
diff --git a/res/values-mcc716-mr/strings.xml b/res/values-mcc716-mr/strings.xml
index 790d065..ffa94dd 100644
--- a/res/values-mcc716-mr/strings.xml
+++ b/res/values-mcc716-mr/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"आणीबाणी सूचना: चाचणी मेसेज"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"आणीबाणी सूचना: चाचणी/ड्रिल मेसेज"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"आणीबाणी सूचना: चाचणी मेसेज"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"लपवा"</string>
 </resources>
diff --git a/res/values-mcc716-ms/strings.xml b/res/values-mcc716-ms/strings.xml
index a7f9452..e9afe61 100644
--- a/res/values-mcc716-ms/strings.xml
+++ b/res/values-mcc716-ms/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Makluman kecemasan: Mesej ujian"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Makluman kecemasan: Mesej latihan"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Makluman kecemasan: Mesej ujian"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Sembunyikan"</string>
 </resources>
diff --git a/res/values-mcc716-my/strings.xml b/res/values-mcc716-my/strings.xml
index 0ef9276..247e493 100644
--- a/res/values-mcc716-my/strings.xml
+++ b/res/values-mcc716-my/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"အရေးပေါ် သတိပေးချက်− စမ်းသပ်မက်ဆေ့ဂျ်"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"အရေးပေါ် သတိပေးချက်− လေ့ကျင့်ရေး/သရုပ်ပြ မက်ဆေ့ဂျ်"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"အရေးပေါ် သတိပေးချက်− စမ်းသပ်မက်ဆေ့ဂျ်"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"ဝှက်ရန်"</string>
 </resources>
diff --git a/res/values-mcc716-nb/strings.xml b/res/values-mcc716-nb/strings.xml
index f13dad2..a6c24ce 100644
--- a/res/values-mcc716-nb/strings.xml
+++ b/res/values-mcc716-nb/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Nødvarsel: testmelding"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Nødvarsel: øvelsesmelding"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Nødvarsel: testmelding"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Skjul"</string>
 </resources>
diff --git a/res/values-mcc716-ne/strings.xml b/res/values-mcc716-ne/strings.xml
index 6286cb5..5dd1a77 100644
--- a/res/values-mcc716-ne/strings.xml
+++ b/res/values-mcc716-ne/strings.xml
@@ -18,7 +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_exercise_alert" msgid="3061507852301643814">"आपत्कालीन सतर्कता: व्यायाम/कसरतसम्बन्धी सन्देश"</string>
-    <string name="pws_other_message_identifiers" msgid="4992476982074198144">"आपत्कालीन सतर्कता: परीक्षण सन्देश"</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="button_dismiss" msgid="5823921161712171097">"नदेखिने पारियोस्"</string>
 </resources>
diff --git a/res/values-mcc716-nl/strings.xml b/res/values-mcc716-nl/strings.xml
index 199033e..9aeb262 100644
--- a/res/values-mcc716-nl/strings.xml
+++ b/res/values-mcc716-nl/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Noodmelding: testbericht"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Noodmelding: bericht voor oefening/drill"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Noodmelding: testbericht"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Verbergen"</string>
 </resources>
diff --git a/res/values-mcc716-or/strings.xml b/res/values-mcc716-or/strings.xml
index 7c52eaa..7bb0039 100644
--- a/res/values-mcc716-or/strings.xml
+++ b/res/values-mcc716-or/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ: ପରୀକ୍ଷାମୂଳକ ମେସେଜ୍"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ: ବ୍ୟାୟାମ/ଡ୍ରିଲ୍ ସମ୍ବନ୍ଧିତ ମେସେଜ୍"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"ଜରୁରୀକାଳୀନ ଆଲର୍ଟ: ଟେକ୍ସଟ୍ ମେସେଜ୍"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"ଲୁଚାନ୍ତୁ"</string>
 </resources>
diff --git a/res/values-mcc716-pa/strings.xml b/res/values-mcc716-pa/strings.xml
index 757dfa3..a2ba109 100644
--- a/res/values-mcc716-pa/strings.xml
+++ b/res/values-mcc716-pa/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀ: ਟੈਸਟ ਸੁਨੇਹਾ"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ: ਅਭਿਆਸੀ/ਡਰਿੱਲ ਸੁਨੇਹਾ"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ: ਜਾਂਚ ਸੁਨੇਹਾ"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"ਲੁਕਾਓ"</string>
 </resources>
diff --git a/res/values-mcc716-pl/strings.xml b/res/values-mcc716-pl/strings.xml
index a5db854..dc99dc8 100644
--- a/res/values-mcc716-pl/strings.xml
+++ b/res/values-mcc716-pl/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alert o zagrożeniu: wiadomość testowa"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alert o zagrożeniu: komunikat o symulacji"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alert o zagrożeniu: komunikat testowy"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ukryj"</string>
 </resources>
diff --git a/res/values-mcc716-pt-rPT/strings.xml b/res/values-mcc716-pt-rPT/strings.xml
index 9a604cd..4d0fceb 100644
--- a/res/values-mcc716-pt-rPT/strings.xml
+++ b/res/values-mcc716-pt-rPT/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emergência: mensagem de teste"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerta de emergência: mensagem de simulação/exercício"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerta de emergência: mensagem de teste"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ocultar"</string>
 </resources>
diff --git a/res/values-mcc716-pt/strings.xml b/res/values-mcc716-pt/strings.xml
index f5b33f4..1b23446 100644
--- a/res/values-mcc716-pt/strings.xml
+++ b/res/values-mcc716-pt/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alerta de emergência: mensagem de teste"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alerta de emergência: mensagem de treinamento/prática"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alerta de emergência: mensagem de teste"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ocultar"</string>
 </resources>
diff --git a/res/values-mcc716-ro/strings.xml b/res/values-mcc716-ro/strings.xml
index 2fe4739..9e9b0e9 100644
--- a/res/values-mcc716-ro/strings.xml
+++ b/res/values-mcc716-ro/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alertă de urgență: mesaj de testare"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alertă de urgență: mesaj de exercițiu/simulare"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alertă de urgență: mesaj de testare"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ascundeți"</string>
 </resources>
diff --git a/res/values-mcc716-ru/strings.xml b/res/values-mcc716-ru/strings.xml
index ed0a391..26532e1 100644
--- a/res/values-mcc716-ru/strings.xml
+++ b/res/values-mcc716-ru/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Тестовое оповещение о чрезвычайных ситуациях"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Экстренное оповещение: учебная тревога"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Тестовое оповещение о чрезвычайных ситуациях"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Скрыть"</string>
 </resources>
diff --git a/res/values-mcc716-si/strings.xml b/res/values-mcc716-si/strings.xml
index 5e28586..348c26d 100644
--- a/res/values-mcc716-si/strings.xml
+++ b/res/values-mcc716-si/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"හදිසි අනතුරු ඇඟවීම: පරීක්ෂණ පණිවිඩය"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"හදිසි අවස්ථා ඇඟවීම: ව්‍යායාම/සරඹ පණිවිඩය"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"හදිසි අවස්ථා ඇඟවීම: පරීක්ෂණ පණිවිඩය"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"සඟවන්න"</string>
 </resources>
diff --git a/res/values-mcc716-sk/strings.xml b/res/values-mcc716-sk/strings.xml
index 7382fb7..1b195c4 100644
--- a/res/values-mcc716-sk/strings.xml
+++ b/res/values-mcc716-sk/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Tiesňové upozornenie: testovacia správa"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Tiesňové upozornenie: cvičenie alebo cvičná správa"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Tiesňové upozornenie: testovacia správa"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Skryť"</string>
 </resources>
diff --git a/res/values-mcc716-sl/strings.xml b/res/values-mcc716-sl/strings.xml
index 33a629d..2b64193 100644
--- a/res/values-mcc716-sl/strings.xml
+++ b/res/values-mcc716-sl/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Opozorilo v sili: preskusno sporočilo"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Opozorilo v sili: Sporočilo za vajo/simulacijo"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Opozorilo v sili: Preizkusno sporočilo"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Skrij"</string>
 </resources>
diff --git a/res/values-mcc716-sq/strings.xml b/res/values-mcc716-sq/strings.xml
index 96eb821..235200c 100644
--- a/res/values-mcc716-sq/strings.xml
+++ b/res/values-mcc716-sq/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Alarmi i urgjencës: Mesazhi i testimit"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Alarmi i urgjencës: Mesazhi i ushtrimit/stërvitjes"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Alarmi i urgjencës: Mesazhi i testimit"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Fshih"</string>
 </resources>
diff --git a/res/values-mcc716-sr/strings.xml b/res/values-mcc716-sr/strings.xml
index 7d0ddca..b9af2ef 100644
--- a/res/values-mcc716-sr/strings.xml
+++ b/res/values-mcc716-sr/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Обавештење о хитном случају: пробна порука"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Упозорење о хитном случају: порука за вежбу"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Упозорење о хитном случају: пробна порука"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Сакриј"</string>
 </resources>
diff --git a/res/values-mcc716-sv/strings.xml b/res/values-mcc716-sv/strings.xml
index 161eb04..156e9af 100644
--- a/res/values-mcc716-sv/strings.xml
+++ b/res/values-mcc716-sv/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Varning om nödsituation: testmeddelande"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Varning om nödsituation: övnings-/testmeddelande"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Varning om nödsituation: testmeddelande"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Dölj"</string>
 </resources>
diff --git a/res/values-mcc716-sw/strings.xml b/res/values-mcc716-sw/strings.xml
index 70bd6df..6ad6e84 100644
--- a/res/values-mcc716-sw/strings.xml
+++ b/res/values-mcc716-sw/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Arifa ya dharura: Ujumbe wa jaribio"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Arifa ya dharura: Ujumbe wa Mazoezi/Jaribio"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Arifa ya dharura: Ujumbe wa jaribio"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ficha"</string>
 </resources>
diff --git a/res/values-mcc716-ta/strings.xml b/res/values-mcc716-ta/strings.xml
index 57ea9b6..a9349e6 100644
--- a/res/values-mcc716-ta/strings.xml
+++ b/res/values-mcc716-ta/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"அவசரக்கால எச்சரிக்கை: சோதனை மெசேஜ்"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"அவசரகால எச்சரிக்கை: பயிற்சி/டிரில் மெசேஜ்"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"அவசரகால எச்சரிக்கை: சோதனை மெசேஜ்"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"மறை"</string>
 </resources>
diff --git a/res/values-mcc716-te/strings.xml b/res/values-mcc716-te/strings.xml
index ddc13f3..f600809 100644
--- a/res/values-mcc716-te/strings.xml
+++ b/res/values-mcc716-te/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"అత్యవసర హెచ్చరిక: పరీక్ష సందేశం"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"అత్యవసర అలర్ట్: అభ్యాసం/డ్రిల్ సందేశం"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"అత్యవసర అలర్ట్: పరీక్ష సందేశం"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"దాచు"</string>
 </resources>
diff --git a/res/values-mcc716-th/strings.xml b/res/values-mcc716-th/strings.xml
index 265c8da..2c9152a 100644
--- a/res/values-mcc716-th/strings.xml
+++ b/res/values-mcc716-th/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"การแจ้งเตือนฉุกเฉิน: ข้อความทดสอบ"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"การแจ้งเตือนฉุกเฉิน: ข้อความทดสอบ/ฝึกซ้อม"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"การแจ้งเตือนฉุกเฉิน: ข้อความทดสอบ"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"ซ่อน"</string>
 </resources>
diff --git a/res/values-mcc716-tl/strings.xml b/res/values-mcc716-tl/strings.xml
index 2dddef8..289f756 100644
--- a/res/values-mcc716-tl/strings.xml
+++ b/res/values-mcc716-tl/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Pang-emergency na alerto: Pansubok na mensahe"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Pang-emergency na alerto: Pagsasanay na mensahe"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Pang-emergency na alerto: Pansubok na mensahe"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Itago"</string>
 </resources>
diff --git a/res/values-mcc716-tr/strings.xml b/res/values-mcc716-tr/strings.xml
index e12d2d9..b8863a7 100644
--- a/res/values-mcc716-tr/strings.xml
+++ b/res/values-mcc716-tr/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Acil durum uyarısı: Test mesajı"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Acil durum uyarısı: Alıştırma/Tatbikat mesajı"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Acil durum uyarısı: Test mesajı"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Gizle"</string>
 </resources>
diff --git a/res/values-mcc716-uk/strings.xml b/res/values-mcc716-uk/strings.xml
index b8fb6b3..46dfc79 100644
--- a/res/values-mcc716-uk/strings.xml
+++ b/res/values-mcc716-uk/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Сповіщення про надзвичайну ситуацію: тестове повідомлення"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Екстрене сповіщення: тренувальне/симуляційне повідомлення"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Екстрене сповіщення: тестове повідомлення"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Сховати"</string>
 </resources>
diff --git a/res/values-mcc716-ur/strings.xml b/res/values-mcc716-ur/strings.xml
index 1550afe..f4bdc6b 100644
--- a/res/values-mcc716-ur/strings.xml
+++ b/res/values-mcc716-ur/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"ہنگامی الرٹ: ٹیسٹ پیغام"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"ہنگامی الرٹ: ورزش/ڈرِل پیغام"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"ہنگامی الرٹ: ٹیسٹ پیغام"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"چھپائیں"</string>
 </resources>
diff --git a/res/values-mcc716-uz/strings.xml b/res/values-mcc716-uz/strings.xml
index 4f7502e..72acbcc 100644
--- a/res/values-mcc716-uz/strings.xml
+++ b/res/values-mcc716-uz/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Favqulodda ogohlantiruv: sinov xabari"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Favqulodda ogohlantiruv: oʻquv-mashgʻulot xabari"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Favqulodda ogohlantiruv: sinov xabari"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Berkitish"</string>
 </resources>
diff --git a/res/values-mcc716-vi/strings.xml b/res/values-mcc716-vi/strings.xml
index 1a62919..00d1aff 100644
--- a/res/values-mcc716-vi/strings.xml
+++ b/res/values-mcc716-vi/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Cảnh báo khẩn cấp: Tin nhắn thử nghiệm"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Cảnh báo khẩn cấp: Thông báo diễn tập/luyện tập"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Cảnh báo khẩn cấp: Thông báo thử nghiệm"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Ẩn"</string>
 </resources>
diff --git a/res/values-mcc716-zh-rCN/strings.xml b/res/values-mcc716-zh-rCN/strings.xml
index 427bbba..ed86198 100644
--- a/res/values-mcc716-zh-rCN/strings.xml
+++ b/res/values-mcc716-zh-rCN/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"紧急警报:测试消息"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"紧急警报:演习/模拟消息"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"紧急警报:测试消息"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"隐藏"</string>
 </resources>
diff --git a/res/values-mcc716-zh-rHK/strings.xml b/res/values-mcc716-zh-rHK/strings.xml
index 411e3c9..7ac0aa3 100644
--- a/res/values-mcc716-zh-rHK/strings.xml
+++ b/res/values-mcc716-zh-rHK/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"緊急警示:測試訊息"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"緊急警示:練習/演習訊息"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"緊急警示:測試訊息"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"隱藏"</string>
 </resources>
diff --git a/res/values-mcc716-zh-rTW/strings.xml b/res/values-mcc716-zh-rTW/strings.xml
index 053466b..5f790ed 100644
--- a/res/values-mcc716-zh-rTW/strings.xml
+++ b/res/values-mcc716-zh-rTW/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"緊急警報:測試訊息"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"緊急警報:演習/模擬訊息"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"緊急警報:測試訊息"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"隱藏"</string>
 </resources>
diff --git a/res/values-mcc716-zu/strings.xml b/res/values-mcc716-zu/strings.xml
index f60baed..9dfd6ed 100644
--- a/res/values-mcc716-zu/strings.xml
+++ b/res/values-mcc716-zu/strings.xml
@@ -21,4 +21,5 @@
     <string name="cmas_required_monthly_test" msgid="9061179556831144678">"Isexwayiso esiphuthumayo: Umlayezo wokuhlolwa"</string>
     <string name="cmas_exercise_alert" msgid="3061507852301643814">"Isexwayiso esiphuthumayo: Umlayezo we-Exercise/Drill"</string>
     <string name="pws_other_message_identifiers" msgid="4992476982074198144">"Isexwayiso esiphuthumayo: Umlayezo wokuhlolwa"</string>
+    <string name="button_dismiss" msgid="5823921161712171097">"Fihla"</string>
 </resources>
diff --git a/res/values-mcc716/config.xml b/res/values-mcc716/config.xml
index a43a017..a837a73 100644
--- a/res/values-mcc716/config.xml
+++ b/res/values-mcc716/config.xml
@@ -22,42 +22,52 @@
     <!-- Whether to show amber alert settings -->
     <bool name="show_amber_alert_settings">false</bool>
 
-    <!-- 4370, 4383, 50 -->
+    <!-- 4370, 4383 -->
     <!-- Emergecny alert tone duration set to 3 minute for Peru users -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, alert_duration=180000</item>
-        <item>0x111F:rat=gsm, emergency=true, alert_duration=180000</item>
-        <item>0x032:rat=gsm, emergency=true, alert_duration=180000</item>
+        <item>0x1112:rat=gsm, emergency=true, alert_duration=180000, always_on=true, screen_on_duration=180000</item>
+        <item>0x111F:rat=gsm, emergency=true, alert_duration=180000, always_on=true, screen_on_duration=180000</item>
     </string-array>
     <!-- 4382 -->
     <string-array name="public_safety_messages_channels_range_strings" translatable="false">
-        <item>0x111E:rat=gsm, emergency=true, alert_duration=180000</item>
+        <item>0x111E:rat=gsm, emergency=true, alert_duration=180000, screen_on_duration=180000</item>
     </string-array>
 
     <!-- 4380 -->
     <string-array name="required_monthly_test_range_strings" translatable="false">
-        <item>0x111C:rat=gsm, emergency=true, alert_duration=180000</item>
+        <item>0x111C:rat=gsm, emergency=true, alert_duration=180000, always_on=true, screen_on_duration=180000</item>
     </string-array>
 
     <!--4381 -->
     <string-array name="exercise_alert_range_strings" translatable="false">
-        <item>0x111D:rat=gsm, emergency=true, alert_duration=180000</item>
+        <item>0x111D:rat=gsm, emergency=true, alert_duration=180000, always_on=true, screen_on_duration=180000</item>
     </string-array>
 
     <!-- 4396~4399-->
     <string-array name="additional_cbs_channels_strings" translatable="false">
-        <item>0x112C-0x112F:rat=gsm, emergency=true, alert_duration=180000</item>
+        <item>0x112C-0x112F:rat=gsm, emergency=true, alert_duration=180000, screen_on_duration=180000</item>
     </string-array>
 
+    <!-- hide test alerts toggle. Note that test alerts are set to always_on -->
+    <bool name="show_test_settings">false</bool>
+
+    <!-- Whether to show main switch settings at the top -->
+    <bool name="show_main_switch_settings">false</bool>
+
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false"></string-array>
     <string-array name="cmas_alerts_severe_range_strings" translatable="false"></string-array>
     <string-array name="cmas_amber_alerts_channels_range_strings" translatable="false"></string-array>
     <string-array name="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>
+    <!-- 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 -->
+    <bool name="disable_opt_out_dialog">true</bool>
 
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">true</bool>
+    <bool name="override_dnd">true</bool>
 
     <!-- Link method -->
     <string name="link_method" translatable="false">none</string>
diff --git a/res/values-mcc716/strings.xml b/res/values-mcc716/strings.xml
index 1436510..6ff8d05 100644
--- a/res/values-mcc716/strings.xml
+++ b/res/values-mcc716/strings.xml
@@ -27,6 +27,11 @@
 
     <string name="cmas_presidential_level_alert" translatable="false">@string/emergency_alert</string>
     <string name="cmas_required_monthly_test">Emergency alert: Test message</string>
+    <!-- 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>
+    <!-- Required Spanish (es) translation for this message: "Alerta de Emergencia – mensaje de Prueba" -->
     <string name="pws_other_message_identifiers">Emergency alert: Test message</string>
+    <!-- Text for dismiss button in broadcast message view dialog. [CHAR LIMIT=25]
+         Required Spanish (es) translation for this message: "Ocultar" -->
+    <string name="button_dismiss">Hide</string>
 </resources>
diff --git a/res/values-mcc722-mnc01 b/res/values-mcc722-mnc01
new file mode 120000
index 0000000..706e64d
--- /dev/null
+++ b/res/values-mcc722-mnc01
@@ -0,0 +1 @@
+values-mcc722-mnc010
\ No newline at end of file
diff --git a/res/values-mcc722-mnc010/config.xml b/res/values-mcc722-mnc010/config.xml
new file mode 100644
index 0000000..2e64ee6
--- /dev/null
+++ b/res/values-mcc722-mnc010/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources>
+  <string-array name="additional_cbs_channels_strings" translatable="false">
+    <!-- Channel 50 for area update info -->
+    <item>0x32:type=area, emergency=false</item>
+  </string-array>
+  <bool name="config_showAreaUpdateInfoSettings">true</bool>
+</resources>
\ No newline at end of file
diff --git a/res/values-mcc730-af/strings.xml b/res/values-mcc730-af/strings.xml
new file mode 100644
index 0000000..c32841a
--- /dev/null
+++ b/res/values-mcc730-af/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Toetsboodskap"</string>
+</resources>
diff --git a/res/values-mcc730-am/strings.xml b/res/values-mcc730-am/strings.xml
new file mode 100644
index 0000000..c898f9b
--- /dev/null
+++ b/res/values-mcc730-am/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"የሙከራ መልዕክት"</string>
+</resources>
diff --git a/res/values-mcc730-ar/strings.xml b/res/values-mcc730-ar/strings.xml
new file mode 100644
index 0000000..a837edc
--- /dev/null
+++ b/res/values-mcc730-ar/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"رسالة اختبار"</string>
+</resources>
diff --git a/res/values-mcc730-as/strings.xml b/res/values-mcc730-as/strings.xml
new file mode 100644
index 0000000..7cce97b
--- /dev/null
+++ b/res/values-mcc730-as/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"পৰীক্ষামূলক বার্তা"</string>
+</resources>
diff --git a/res/values-mcc730-az/strings.xml b/res/values-mcc730-az/strings.xml
new file mode 100644
index 0000000..15b6ff8
--- /dev/null
+++ b/res/values-mcc730-az/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Test Mesajı"</string>
+</resources>
diff --git a/res/values-mcc730-b+sr+Latn/strings.xml b/res/values-mcc730-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..260122c
--- /dev/null
+++ b/res/values-mcc730-b+sr+Latn/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Probna poruka"</string>
+</resources>
diff --git a/res/values-mcc730-be/strings.xml b/res/values-mcc730-be/strings.xml
new file mode 100644
index 0000000..25974fb
--- /dev/null
+++ b/res/values-mcc730-be/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Тэставае паведамленне"</string>
+</resources>
diff --git a/res/values-mcc730-bg/strings.xml b/res/values-mcc730-bg/strings.xml
new file mode 100644
index 0000000..d2953b2
--- /dev/null
+++ b/res/values-mcc730-bg/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Тестово съобщение"</string>
+</resources>
diff --git a/res/values-mcc730-bn/strings.xml b/res/values-mcc730-bn/strings.xml
new file mode 100644
index 0000000..52c2e06
--- /dev/null
+++ b/res/values-mcc730-bn/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"পরীক্ষামূলক মেসেজ"</string>
+</resources>
diff --git a/res/values-mcc730-bs/strings.xml b/res/values-mcc730-bs/strings.xml
new file mode 100644
index 0000000..5d5938d
--- /dev/null
+++ b/res/values-mcc730-bs/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testna poruka"</string>
+</resources>
diff --git a/res/values-mcc730-ca/strings.xml b/res/values-mcc730-ca/strings.xml
new file mode 100644
index 0000000..f30c216
--- /dev/null
+++ b/res/values-mcc730-ca/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Missatge de prova"</string>
+</resources>
diff --git a/res/values-mcc730-cs/strings.xml b/res/values-mcc730-cs/strings.xml
new file mode 100644
index 0000000..4f89a05
--- /dev/null
+++ b/res/values-mcc730-cs/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testovací zpráva"</string>
+</resources>
diff --git a/res/values-mcc730-da/strings.xml b/res/values-mcc730-da/strings.xml
new file mode 100644
index 0000000..ec45bac
--- /dev/null
+++ b/res/values-mcc730-da/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testmeddelelse"</string>
+</resources>
diff --git a/res/values-mcc730-de/strings.xml b/res/values-mcc730-de/strings.xml
new file mode 100644
index 0000000..dcbfa0a
--- /dev/null
+++ b/res/values-mcc730-de/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testnachricht"</string>
+</resources>
diff --git a/res/values-mcc730-el/strings.xml b/res/values-mcc730-el/strings.xml
new file mode 100644
index 0000000..0197f37
--- /dev/null
+++ b/res/values-mcc730-el/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Δοκιμαστικό μήνυμα"</string>
+</resources>
diff --git a/res/values-mcc730-en-rAU/strings.xml b/res/values-mcc730-en-rAU/strings.xml
new file mode 100644
index 0000000..4f20a38
--- /dev/null
+++ b/res/values-mcc730-en-rAU/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Test message"</string>
+</resources>
diff --git a/res/values-mcc730-en-rCA/strings.xml b/res/values-mcc730-en-rCA/strings.xml
new file mode 100644
index 0000000..4f20a38
--- /dev/null
+++ b/res/values-mcc730-en-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Test message"</string>
+</resources>
diff --git a/res/values-mcc730-en-rGB/strings.xml b/res/values-mcc730-en-rGB/strings.xml
new file mode 100644
index 0000000..4f20a38
--- /dev/null
+++ b/res/values-mcc730-en-rGB/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Test message"</string>
+</resources>
diff --git a/res/values-mcc730-en-rIN/strings.xml b/res/values-mcc730-en-rIN/strings.xml
new file mode 100644
index 0000000..4f20a38
--- /dev/null
+++ b/res/values-mcc730-en-rIN/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Test message"</string>
+</resources>
diff --git a/res/values-mcc730-en-rXC/strings.xml b/res/values-mcc730-en-rXC/strings.xml
new file mode 100644
index 0000000..6bae83c
--- /dev/null
+++ b/res/values-mcc730-en-rXC/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎Test Message‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-mcc730-es-rUS/strings.xml b/res/values-mcc730-es-rUS/strings.xml
new file mode 100644
index 0000000..99bc867
--- /dev/null
+++ b/res/values-mcc730-es-rUS/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Mensaje de prueba"</string>
+</resources>
diff --git a/res/values-mcc730-es/strings.xml b/res/values-mcc730-es/strings.xml
new file mode 100644
index 0000000..99bc867
--- /dev/null
+++ b/res/values-mcc730-es/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Mensaje de prueba"</string>
+</resources>
diff --git a/res/values-mcc730-et/strings.xml b/res/values-mcc730-et/strings.xml
new file mode 100644
index 0000000..0ed8b91
--- /dev/null
+++ b/res/values-mcc730-et/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testsõnum"</string>
+</resources>
diff --git a/res/values-mcc730-eu/strings.xml b/res/values-mcc730-eu/strings.xml
new file mode 100644
index 0000000..0dd7ce2
--- /dev/null
+++ b/res/values-mcc730-eu/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Probako mezua"</string>
+</resources>
diff --git a/res/values-mcc730-fa/strings.xml b/res/values-mcc730-fa/strings.xml
new file mode 100644
index 0000000..8aa909e
--- /dev/null
+++ b/res/values-mcc730-fa/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"پیام آزمایشی"</string>
+</resources>
diff --git a/res/values-mcc730-fi/strings.xml b/res/values-mcc730-fi/strings.xml
new file mode 100644
index 0000000..56967d7
--- /dev/null
+++ b/res/values-mcc730-fi/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Koeviesti"</string>
+</resources>
diff --git a/res/values-mcc730-fr-rCA/strings.xml b/res/values-mcc730-fr-rCA/strings.xml
new file mode 100644
index 0000000..4e2526d
--- /dev/null
+++ b/res/values-mcc730-fr-rCA/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Message test"</string>
+</resources>
diff --git a/res/values-mcc730-fr/strings.xml b/res/values-mcc730-fr/strings.xml
new file mode 100644
index 0000000..4e2526d
--- /dev/null
+++ b/res/values-mcc730-fr/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Message test"</string>
+</resources>
diff --git a/res/values-mcc730-gl/strings.xml b/res/values-mcc730-gl/strings.xml
new file mode 100644
index 0000000..e6c3fbd
--- /dev/null
+++ b/res/values-mcc730-gl/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Mensaxe de proba"</string>
+</resources>
diff --git a/res/values-mcc730-gu/strings.xml b/res/values-mcc730-gu/strings.xml
new file mode 100644
index 0000000..e11d32e
--- /dev/null
+++ b/res/values-mcc730-gu/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"પરીક્ષણ માટેનો સંદેશ"</string>
+</resources>
diff --git a/res/values-mcc730-hi/strings.xml b/res/values-mcc730-hi/strings.xml
new file mode 100644
index 0000000..c44b468
--- /dev/null
+++ b/res/values-mcc730-hi/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"टेस्ट मैसेज"</string>
+</resources>
diff --git a/res/values-mcc730-hr/strings.xml b/res/values-mcc730-hr/strings.xml
new file mode 100644
index 0000000..5d5938d
--- /dev/null
+++ b/res/values-mcc730-hr/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testna poruka"</string>
+</resources>
diff --git a/res/values-mcc730-hu/strings.xml b/res/values-mcc730-hu/strings.xml
new file mode 100644
index 0000000..2b3d2ea
--- /dev/null
+++ b/res/values-mcc730-hu/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Tesztüzenet"</string>
+</resources>
diff --git a/res/values-mcc730-hy/strings.xml b/res/values-mcc730-hy/strings.xml
new file mode 100644
index 0000000..397da43
--- /dev/null
+++ b/res/values-mcc730-hy/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Փորձնական հաղորդագրություն"</string>
+</resources>
diff --git a/res/values-mcc730-in/strings.xml b/res/values-mcc730-in/strings.xml
new file mode 100644
index 0000000..b48ebe8
--- /dev/null
+++ b/res/values-mcc730-in/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Pesan Uji Coba"</string>
+</resources>
diff --git a/res/values-mcc730-is/strings.xml b/res/values-mcc730-is/strings.xml
new file mode 100644
index 0000000..582f7b6
--- /dev/null
+++ b/res/values-mcc730-is/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Prufuskilaboð"</string>
+</resources>
diff --git a/res/values-mcc730-it/strings.xml b/res/values-mcc730-it/strings.xml
new file mode 100644
index 0000000..1e0e619
--- /dev/null
+++ b/res/values-mcc730-it/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Messaggio di test"</string>
+</resources>
diff --git a/res/values-mcc730-iw/strings.xml b/res/values-mcc730-iw/strings.xml
new file mode 100644
index 0000000..acec47a
--- /dev/null
+++ b/res/values-mcc730-iw/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"הודעה לבדיקה"</string>
+</resources>
diff --git a/res/values-mcc730-ja/strings.xml b/res/values-mcc730-ja/strings.xml
new file mode 100644
index 0000000..acf93a1
--- /dev/null
+++ b/res/values-mcc730-ja/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"テスト メッセージ"</string>
+</resources>
diff --git a/res/values-mcc730-ka/strings.xml b/res/values-mcc730-ka/strings.xml
new file mode 100644
index 0000000..b55b45f
--- /dev/null
+++ b/res/values-mcc730-ka/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"სატესტო შეტყობინება"</string>
+</resources>
diff --git a/res/values-mcc730-kk/strings.xml b/res/values-mcc730-kk/strings.xml
new file mode 100644
index 0000000..0bdcddf
--- /dev/null
+++ b/res/values-mcc730-kk/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Сынақ хабары"</string>
+</resources>
diff --git a/res/values-mcc730-km/strings.xml b/res/values-mcc730-km/strings.xml
new file mode 100644
index 0000000..17eae97
--- /dev/null
+++ b/res/values-mcc730-km/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"សារ​សាកល្បង"</string>
+</resources>
diff --git a/res/values-mcc730-kn/strings.xml b/res/values-mcc730-kn/strings.xml
new file mode 100644
index 0000000..570c3eb
--- /dev/null
+++ b/res/values-mcc730-kn/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"ಪರೀಕ್ಷಾ ಸಂದೇಶ"</string>
+</resources>
diff --git a/res/values-mcc730-ko/strings.xml b/res/values-mcc730-ko/strings.xml
new file mode 100644
index 0000000..c05358a
--- /dev/null
+++ b/res/values-mcc730-ko/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"테스트 메시지"</string>
+</resources>
diff --git a/res/values-mcc730-ky/strings.xml b/res/values-mcc730-ky/strings.xml
new file mode 100644
index 0000000..826d157
--- /dev/null
+++ b/res/values-mcc730-ky/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Сынамык билдирүү"</string>
+</resources>
diff --git a/res/values-mcc730-lo/strings.xml b/res/values-mcc730-lo/strings.xml
new file mode 100644
index 0000000..95ec26a
--- /dev/null
+++ b/res/values-mcc730-lo/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"ຂໍ້ຄວາມທົດສອບ"</string>
+</resources>
diff --git a/res/values-mcc730-lt/strings.xml b/res/values-mcc730-lt/strings.xml
new file mode 100644
index 0000000..b788f23
--- /dev/null
+++ b/res/values-mcc730-lt/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testavimo pranešimas"</string>
+</resources>
diff --git a/res/values-mcc730-lv/strings.xml b/res/values-mcc730-lv/strings.xml
new file mode 100644
index 0000000..e966ebb
--- /dev/null
+++ b/res/values-mcc730-lv/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testa ziņojums"</string>
+</resources>
diff --git a/res/values-mcc730-mk/strings.xml b/res/values-mcc730-mk/strings.xml
new file mode 100644
index 0000000..1cd8388
--- /dev/null
+++ b/res/values-mcc730-mk/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Порака за тестирање"</string>
+</resources>
diff --git a/res/values-mcc730-ml/strings.xml b/res/values-mcc730-ml/strings.xml
new file mode 100644
index 0000000..c1b1424
--- /dev/null
+++ b/res/values-mcc730-ml/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"ടെസ്‌റ്റ് സന്ദേശം"</string>
+</resources>
diff --git a/res/values-mcc730-mn/strings.xml b/res/values-mcc730-mn/strings.xml
new file mode 100644
index 0000000..d6a7c05
--- /dev/null
+++ b/res/values-mcc730-mn/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Туршилтын мессеж"</string>
+</resources>
diff --git a/res/values-mcc730-mr/strings.xml b/res/values-mcc730-mr/strings.xml
new file mode 100644
index 0000000..58f115d
--- /dev/null
+++ b/res/values-mcc730-mr/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"चाचणी मेसेज"</string>
+</resources>
diff --git a/res/values-mcc730-ms/strings.xml b/res/values-mcc730-ms/strings.xml
new file mode 100644
index 0000000..9b15993
--- /dev/null
+++ b/res/values-mcc730-ms/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Mesej Ujian"</string>
+</resources>
diff --git a/res/values-mcc730-my/strings.xml b/res/values-mcc730-my/strings.xml
new file mode 100644
index 0000000..3a4b38c
--- /dev/null
+++ b/res/values-mcc730-my/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"စမ်းသပ် မက်ဆေ့ဂ်ျ"</string>
+</resources>
diff --git a/res/values-mcc730-nb/strings.xml b/res/values-mcc730-nb/strings.xml
new file mode 100644
index 0000000..aae896b
--- /dev/null
+++ b/res/values-mcc730-nb/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testmelding"</string>
+</resources>
diff --git a/res/values-mcc730-ne/strings.xml b/res/values-mcc730-ne/strings.xml
new file mode 100644
index 0000000..e45a751
--- /dev/null
+++ b/res/values-mcc730-ne/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"परीक्षण सन्देश"</string>
+</resources>
diff --git a/res/values-mcc730-nl/strings.xml b/res/values-mcc730-nl/strings.xml
new file mode 100644
index 0000000..480fcdf
--- /dev/null
+++ b/res/values-mcc730-nl/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testbericht"</string>
+</resources>
diff --git a/res/values-mcc730-or/strings.xml b/res/values-mcc730-or/strings.xml
new file mode 100644
index 0000000..66d7052
--- /dev/null
+++ b/res/values-mcc730-or/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"ଟେଷ୍ଟ ମେସେଜ୍"</string>
+</resources>
diff --git a/res/values-mcc730-pa/strings.xml b/res/values-mcc730-pa/strings.xml
new file mode 100644
index 0000000..185a128
--- /dev/null
+++ b/res/values-mcc730-pa/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"ਜਾਂਚ ਸੁਨੇਹਾ"</string>
+</resources>
diff --git a/res/values-mcc730-pl/strings.xml b/res/values-mcc730-pl/strings.xml
new file mode 100644
index 0000000..400a174
--- /dev/null
+++ b/res/values-mcc730-pl/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Wiadomość testowa"</string>
+</resources>
diff --git a/res/values-mcc730-pt-rPT/strings.xml b/res/values-mcc730-pt-rPT/strings.xml
new file mode 100644
index 0000000..d5604dd
--- /dev/null
+++ b/res/values-mcc730-pt-rPT/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Mensagem de teste"</string>
+</resources>
diff --git a/res/values-mcc730-pt/strings.xml b/res/values-mcc730-pt/strings.xml
new file mode 100644
index 0000000..d5604dd
--- /dev/null
+++ b/res/values-mcc730-pt/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Mensagem de teste"</string>
+</resources>
diff --git a/res/values-mcc730-ro/strings.xml b/res/values-mcc730-ro/strings.xml
new file mode 100644
index 0000000..56f59da
--- /dev/null
+++ b/res/values-mcc730-ro/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Mesaj de test"</string>
+</resources>
diff --git a/res/values-mcc730-ru/strings.xml b/res/values-mcc730-ru/strings.xml
new file mode 100644
index 0000000..1d71b94
--- /dev/null
+++ b/res/values-mcc730-ru/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Тестовое сообщение"</string>
+</resources>
diff --git a/res/values-mcc730-si/strings.xml b/res/values-mcc730-si/strings.xml
new file mode 100644
index 0000000..5d67e2f
--- /dev/null
+++ b/res/values-mcc730-si/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"පරීක්ෂණ පණිවිඩය"</string>
+</resources>
diff --git a/res/values-mcc730-sk/strings.xml b/res/values-mcc730-sk/strings.xml
new file mode 100644
index 0000000..9a2ed1e
--- /dev/null
+++ b/res/values-mcc730-sk/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testovacia správa"</string>
+</resources>
diff --git a/res/values-mcc730-sl/strings.xml b/res/values-mcc730-sl/strings.xml
new file mode 100644
index 0000000..681d9fb
--- /dev/null
+++ b/res/values-mcc730-sl/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Preizkusno sporočilo"</string>
+</resources>
diff --git a/res/values-mcc730-sq/strings.xml b/res/values-mcc730-sq/strings.xml
new file mode 100644
index 0000000..074ea7b
--- /dev/null
+++ b/res/values-mcc730-sq/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Mesazh testimi"</string>
+</resources>
diff --git a/res/values-mcc730-sr/strings.xml b/res/values-mcc730-sr/strings.xml
new file mode 100644
index 0000000..b6b2455
--- /dev/null
+++ b/res/values-mcc730-sr/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Пробна порука"</string>
+</resources>
diff --git a/res/values-mcc730-sv/strings.xml b/res/values-mcc730-sv/strings.xml
new file mode 100644
index 0000000..dd2448d
--- /dev/null
+++ b/res/values-mcc730-sv/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Testmeddelande"</string>
+</resources>
diff --git a/res/values-mcc730-sw/strings.xml b/res/values-mcc730-sw/strings.xml
new file mode 100644
index 0000000..ac9056f
--- /dev/null
+++ b/res/values-mcc730-sw/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Ujumbe wa Majaribio"</string>
+</resources>
diff --git a/res/values-mcc730-ta/strings.xml b/res/values-mcc730-ta/strings.xml
new file mode 100644
index 0000000..1b8cac6
--- /dev/null
+++ b/res/values-mcc730-ta/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"சோதனை மெசேஜ்"</string>
+</resources>
diff --git a/res/values-mcc730-te/strings.xml b/res/values-mcc730-te/strings.xml
new file mode 100644
index 0000000..9cf8107
--- /dev/null
+++ b/res/values-mcc730-te/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"టెస్ట్ మెసేజ్"</string>
+</resources>
diff --git a/res/values-mcc730-th/strings.xml b/res/values-mcc730-th/strings.xml
new file mode 100644
index 0000000..d1638f9
--- /dev/null
+++ b/res/values-mcc730-th/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"ข้อความทดสอบ"</string>
+</resources>
diff --git a/res/values-mcc730-tl/strings.xml b/res/values-mcc730-tl/strings.xml
new file mode 100644
index 0000000..5f1d763
--- /dev/null
+++ b/res/values-mcc730-tl/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Pansubok na Mensahe"</string>
+</resources>
diff --git a/res/values-mcc730-tr/strings.xml b/res/values-mcc730-tr/strings.xml
new file mode 100644
index 0000000..15b6ff8
--- /dev/null
+++ b/res/values-mcc730-tr/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Test Mesajı"</string>
+</resources>
diff --git a/res/values-mcc730-uk/strings.xml b/res/values-mcc730-uk/strings.xml
new file mode 100644
index 0000000..ba962f2
--- /dev/null
+++ b/res/values-mcc730-uk/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Тестове повідомлення"</string>
+</resources>
diff --git a/res/values-mcc730-ur/strings.xml b/res/values-mcc730-ur/strings.xml
new file mode 100644
index 0000000..f6401ee
--- /dev/null
+++ b/res/values-mcc730-ur/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"ٹیسٹ پیغام"</string>
+</resources>
diff --git a/res/values-mcc730-uz/strings.xml b/res/values-mcc730-uz/strings.xml
new file mode 100644
index 0000000..7807633
--- /dev/null
+++ b/res/values-mcc730-uz/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Sinov xabari"</string>
+</resources>
diff --git a/res/values-mcc730-vi/strings.xml b/res/values-mcc730-vi/strings.xml
new file mode 100644
index 0000000..7b209c3
--- /dev/null
+++ b/res/values-mcc730-vi/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Thông báo thử nghiệm"</string>
+</resources>
diff --git a/res/values-mcc730-zh-rCN/strings.xml b/res/values-mcc730-zh-rCN/strings.xml
new file mode 100644
index 0000000..91fc1f4
--- /dev/null
+++ b/res/values-mcc730-zh-rCN/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"测试消息"</string>
+</resources>
diff --git a/res/values-mcc730-zh-rHK/strings.xml b/res/values-mcc730-zh-rHK/strings.xml
new file mode 100644
index 0000000..ffdbeb9
--- /dev/null
+++ b/res/values-mcc730-zh-rHK/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"測試訊息"</string>
+</resources>
diff --git a/res/values-mcc730-zh-rTW/strings.xml b/res/values-mcc730-zh-rTW/strings.xml
new file mode 100644
index 0000000..ffdbeb9
--- /dev/null
+++ b/res/values-mcc730-zh-rTW/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"測試訊息"</string>
+</resources>
diff --git a/res/values-mcc730-zu/strings.xml b/res/values-mcc730-zu/strings.xml
new file mode 100644
index 0000000..050607c
--- /dev/null
+++ b/res/values-mcc730-zu/strings.xml
@@ -0,0 +1,20 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="cmas_required_monthly_test" msgid="530685628438270164">"Umlayezo Wokuhlola"</string>
+</resources>
diff --git a/res/values-mcc730/config.xml b/res/values-mcc730/config.xml
index 82fa8ac..563ddfd 100644
--- a/res/values-mcc730/config.xml
+++ b/res/values-mcc730/config.xml
@@ -21,17 +21,18 @@
     <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 public safety settings -->
+    <bool name="show_public_safety_settings">false</bool>
 
+    <!-- 4383, 921 -->
     <string-array name="public_safety_messages_channels_range_strings" translatable="false">
-        <!-- Channel 919 and 921 are required by Chile -->
-        <item>0x0397:rat=gsm, emergency=true, alert_duration=86400000</item>
-        <item>0x0399:type=other, emergency=false</item>
+        <item>0x111F:rat=gsm, emergency=true, alert_duration=86400000</item>
+        <item>0x0399:rat=gsm, emergency=true, alert_duration=86400000</item>
     </string-array>
-    <!-- 4370, 4383 -->
+    <!-- 4370, 919 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, alert_duration=86400000</item>
-        <!-- additional language -->
-        <item>0x1120-0x1121:rat=gsm, emergency=true</item>
+        <item>0x1112:rat=gsm, emergency=true, alert_duration=86400000, always_on=true</item>
+        <item>0x0397:rat=gsm, emergency=true, alert_duration=86400000, always_on=true</item>
     </string-array>
     <!-- 4371~4372 -->
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
@@ -47,8 +48,8 @@
     </string-array>
     <!-- 4380~4382, 519 -->
     <string-array name="required_monthly_test_range_strings" translatable="false">
-        <item>0x111C:rat=gsm, type=info, emergency=true, alert_duration=86400000</item>
-        <item>0x207:rat=gsm, type=info, emergency=true, alert_duration=86400000</item>
+        <item>0x111C:rat=gsm, type=info, emergency=true, language=es</item>
+        <item>0x207:rat=gsm, type=info, emergency=true</item>
     </string-array>
     <string-array name="exercise_alert_range_strings" translatable="false">
         <item>0x111D:rat=gsm, emergency=true, alert_duration=86400000</item>
@@ -58,12 +59,22 @@
     </string-array>
 
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">true</bool>
+    <bool name="override_dnd">true</bool>
     <!-- Append date-time to the alert title -->
-    <bool name="show_date_time_title">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 opt-out dialog for all channels -->
+    <bool name="disable_opt_out_dialog">true</bool>
+    <bool name="show_main_switch_settings">false</bool>
+
+    <!-- String used to override message body for certain service categories.
+         The format for each entry is: "service_category:message".
+         '>' is a special character which indicates that the carrier's name should be shown -->
+    <string-array name="message_body_override" translatable="false">
+        <item>4380:Esta es una prueba de mantenimiento, sin costo, del Sistema de Alerta de Emergencia, emitido por ></item>
+    </string-array>
 </resources>
 
diff --git a/res/values-mcc732/config.xml b/res/values-mcc732/config.xml
index 2cf4b8e..83f798f 100644
--- a/res/values-mcc732/config.xml
+++ b/res/values-mcc732/config.xml
@@ -17,7 +17,7 @@
 <resources>
     <!-- Channel 4370 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true, alert_duration=86400000</item>
+        <item>0x1112:rat=gsm, emergency=true, alert_duration=86400000, always_on=true</item>
     </string-array>
 
     <!-- Channel 50 and 919 -->
@@ -28,7 +28,7 @@
     </string-array>
 
     <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">true</bool>
+    <bool name="override_dnd">true</bool>
 
     <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app -->
     <bool name="config_showAreaUpdateInfoSettings">true</bool>
diff --git a/res/values-mcc740/config.xml b/res/values-mcc740/config.xml
index 2cf4b8e..3b80517 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</item>
+        <item>0x1112:rat=gsm, emergency=true, alert_duration=180000, always_on=true, override_dnd=true</item>
     </string-array>
-
-    <!-- Channel 50 and 919 -->
+    <!-- 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>
     <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>0x32:type=area, emergency=false</item>
     </string-array>
-
-    <!-- Play alert sound in full volume regardless Do Not Disturb is on -->
-    <bool name="override_dnd_default">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 0000000..1e4f784
--- /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 20349c0..1dea679 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"Поставки"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Избриши емитувања"</string>
     <string name="message_options" msgid="3178489901903589574">"Опции на порака"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Прикажи детали"</string>
@@ -52,10 +57,14 @@
     <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">"Автоматски промени на поставките за безжичните предупредувања за итни случаи според 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">"Користи „од текст во говор“ за да изговараш пораки за безжични предупредувања за итни случаи"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Емитување локални информации за состојбата"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 4b501c1..79ba6f2 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"ക്രമീകരണം"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"പ്രക്ഷേപണങ്ങൾ ഇല്ലാതാക്കുക"</string>
     <string name="message_options" msgid="3178489901903589574">"സന്ദേശ ഓപ്‌ഷനുകൾ"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"വിശദാംശങ്ങൾ കാണുക"</string>
@@ -52,10 +57,14 @@
     <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="enable_alerts_master_toggle_title" msgid="1457904343636699446">"അലേർട്ടുകൾ അനുവദിക്കുക"</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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ഏരിയ അപ്‌ഡേറ്റ് ബ്രോഡ്‌കാസ്റ്റുകൾ"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 4adb9b4..51212e9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -18,9 +18,14 @@
     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="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">"OK"</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>
     <string name="menu_view_details" msgid="1040989019045280975">"Дэлгэрэнгүй үзэх"</string>
@@ -52,10 +57,14 @@
     <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 автомат тохиргоо 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">"Утасгүй гамшгийн аюулын дохионы мессежийг чангаар уншихын тулд текстийг-яриа-болгохыг ашиглана уу"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Газрын шинэчлэлтийн дамжуулалт"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 0b5673e..ccc9b35 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"सेटिंग्ज"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"प्रसारणे हटवा"</string>
     <string name="message_options" msgid="3178489901903589574">"मेसेज पर्याय"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"तपशील पहा"</string>
@@ -52,10 +57,14 @@
     <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">"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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"परिसराशी संबंधित अपडेट ब्रॉडकास्ट"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6c3d579..37f7d48 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Makluman kecemasan wayarles"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Makluman kecemasan wayarles"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Makluman kecemasan wayarles"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Makluman kecemasan wayarles"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Makluman kecemasan wayarles"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Pemberitahuan mengenai maklumat"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Tetapan makluman kecemasan wayarles tidak tersedia untuk pengguna ini"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Tiada makluman terdahulu"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Tetapan"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Padam siaran"</string>
     <string name="message_options" msgid="3178489901903589574">"Pilihan mesej"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Lihat butiran"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Makluman"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesej siaran"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Makluman kecemasan"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Amaran Kecemasan yang Tidak Diiktiraf"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Makluman kecemasan dalam panggilan suara"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Tetapan WEA automatik diubah berdasarkan SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Benarkan makluman"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Terima pemberitahuan makluman kecemasan wayarles"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Peringatan makluman"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Tuturkan mesej isyarat"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Gunakan teks ke pertuturan untuk menuturkan mesej makluman kecemasan wayarles"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Bunyi peringatan akan dimainkan pada kelantangan biasa"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Sejarah makluman kecemasan"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Pilihan makluman"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Beri amaran tentang peristiwa yang mengancam nyawa"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Makluman ujian"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Terima ujian pembawa dan ujian bulanan daripada sistem makluman keselamatan"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Terima makluman kecemasan: Mesej latihan"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Terima makluman kecemasan: Pengendali ditakrifkan"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Getaran"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Sentiasa beri makluman pada kelantangan penuh"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Abaikan Jangan Ganggu &amp; tetapan kelantangan yang lain"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Siaran kemas kini kawasan"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Masa menunggu maksimum:"</string>
     <string name="seconds" msgid="141450721520515025">"saat"</string>
     <string name="message_copied" msgid="6922953753733166675">"Mesej disalin"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Tetapan diubah oleh pembawa"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Ketik untuk melihat tetapan amaran kecemasan wayarles"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 9a280f3..4259132 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -18,9 +18,14 @@
     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="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">"OK"</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>
     <string name="menu_view_details" msgid="1040989019045280975">"အသေးစိတ်များ ကြည့်ရှု"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"နယ်မြေအပ်ဒိတ် ထုတ်လွှင့်ခြင်းများ"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ccf38a9..77d3409 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Trådløse nødvarsler"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Trådløse nødvarsler"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Trådløse nødvarsler"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Trådløse nødvarsler"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Trådløse nødvarsler"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informasjonsvarsel"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Innstillingene for trådløse nødvarsler er ikke tilgjengelige for denne brukeren"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Ingen tidligere varsler"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Innstillinger"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Slett vanlig ETWS-kringkasting"</string>
     <string name="message_options" msgid="3178489901903589574">"Meldingsalternativer"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Se detaljer"</string>
@@ -52,11 +57,15 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Varsler"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Kringkastingsmeldinger"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Nødvarsler"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Ukvitterte nødvarsler"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Nødvarsler i taleanrop"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"De automatiske innstillingene for trådløse nødvarsler endres basert på SIM-kortet"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Tillat varsler"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Motta trådløse nødvarsler"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Påminnelse om varsel"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"En påminnelseslyd spilles av med vanlig volum"</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="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>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Advar om livstruende hendelser"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testvarsler"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Motta operatørtester og månedlige tester fra systemet for sikkerhetsvarsling"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Motta nødvarsel: øvelsesmelding"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Motta nødvarsel: Operatøren er definert"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrasjon"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Varsle alltid på fullt volum"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorer «Ikke forstyrr» og andre voluminnstillinger"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Kringkastinger av områdeoppdateringer"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimal ventetid:"</string>
     <string name="seconds" msgid="141450721520515025">"sekunder"</string>
     <string name="message_copied" msgid="6922953753733166675">"Meldingen er kopiert"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Innstillingene er endret av operatøren"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Trykk for å se innstillinger for trådløse nødvarsler"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 1402a5b..c944e56 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"सेटिङहरू"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"प्रसारणहरू मेटाउनुहोस्"</string>
     <string name="message_options" msgid="3178489901903589574">"सन्देश विकल्पहरू"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"विवरणहरू हेर्नुहोस्"</string>
@@ -52,10 +57,14 @@
     <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 का स्वचालित सेटिङ 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">"आपत्‌कालीन वायरलेस सतर्कता सन्देशहरूलाई आवाजमा परिवर्तन गर्न टेक्स्ट-टू-स्पिच सुविधा प्रयोग गर्नुहोस्"</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>
@@ -77,7 +86,14 @@
     <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_alert_vibrate_title" msgid="5421032189422312508">"भाइब्रेसन"</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_summary" msgid="4733669825477146614"></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>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
new file mode 100644
index 0000000..7823667
--- /dev/null
+++ b/res/values-night/themes.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2020 The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<resources>
+    <style name="CellBroadcastAlertTheme" parent="@android:style/Theme.DeviceDefault.Dialog.Alert"/>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b54fd76..b956b74 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Noodwaarschuwingen"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Noodwaarschuwingen"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Noodwaarschuwingen"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Noodwaarschuwingen"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Noodwaarschuwingen"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informatieve melding"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Instellingen voor noodwaarschuwingen zijn niet beschikbaar voor deze gebruiker"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Geen eerdere meldingen"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Instellingen"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Broadcasts verwijderen"</string>
     <string name="message_options" msgid="3178489901903589574">"Berichtopties"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Details bekijken"</string>
@@ -52,12 +57,16 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Waarschuwingen"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast-berichten"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Noodmeldingen"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Niet-bevestigde noodmeldingen"</string>
     <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">"Krijg meldingen voor noodwaarschuwingen"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Herinnering voor meldingen"</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="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_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>
@@ -77,7 +86,14 @@
     <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">"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>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Noodmelding ontvangen: provider gedefinieerd"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Trillen"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Altijd melden op vol volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"\'Niet storen\' en andere volume-instellingen negeren"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Broadcasts met lokale informatie"</string>
@@ -121,7 +137,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">"Noodmeldings­geschiedenis"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Noodmeldingsgeschiedenis"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Eenmalig"</item>
     <item msgid="9097229303902157183">"Elke 2 minuten"</item>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximum wachttijd:"</string>
     <string name="seconds" msgid="141450721520515025">"seconden"</string>
     <string name="message_copied" msgid="6922953753733166675">"Bericht gekopieerd"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Instellingen gewijzigd door provider"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tik om de instellingen voor meldingen voor noodwaarschuwingen te bekijken"</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 91f1c96..73c3a88 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"ସେଟିଂସ୍"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ବ୍ରୋଡକାଷ୍ଟକୁ ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
     <string name="message_options" msgid="3178489901903589574">"ମେସେଜ୍‌ ବିକଳ୍ପ"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"ବିବରଣୀ ଦେଖନ୍ତୁ"</string>
@@ -52,10 +57,14 @@
     <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">"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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ଅଞ୍ଚଳ ଅପଡେଟ୍‍ ବ୍ରୋଡକାଷ୍ଟକରିବା"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index d375a30..6a5ead9 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -18,9 +18,14 @@
     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="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>
     <string name="menu_view_details" msgid="1040989019045280975">"ਵੇਰਵੇ ਦੇਖੋ"</string>
@@ -52,10 +57,14 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ਖੇਤਰ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਦੇ ਪ੍ਰਸਾਰਣ"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 609c9df..3ca0004 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alerty o zagrożeniu"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alerty o zagrożeniu"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alerty o zagrożeniu"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alerty o zagrożeniu"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alerty o zagrożeniu"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Powiadomienie informacyjne"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Ustawienia alertów o zagrożeniu są niedostępne dla tego użytkownika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Brak wcześniejszych alertów"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Ustawienia"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Usuń transmisje"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcje wiadomości"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Wyświetl szczegóły"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerty"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Komunikaty"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alerty o zagrożeniu"</string>
+    <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="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Zezwalaj na alerty"</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_summary" msgid="5583168548073938617">"Otrzymuj alerty o zagrożeniu"</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>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historia alertów o zagrożeniu"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Ustawienia alertów"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Ostrzegaj o wydarzeniach zagrażających życiu"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alerty testowe"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Otrzymuj testy operatora oraz comiesięczne testy z systemu alertów bezpieczeństwa"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Otrzymuj alerty o zagrożeniu: komunikat o symulacji"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Otrzymuj alert o zagrożeniu: zdefiniowano operatora"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Wibracje"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Zawsze ostrzegaj z pełną głośnością"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignoruj ustawienia dźwięku w trybie Nie przeszkadzać i innych"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Aktualne informacje z danego obszaru"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksymalny czas oczekiwania:"</string>
     <string name="seconds" msgid="141450721520515025">"sek."</string>
     <string name="message_copied" msgid="6922953753733166675">"Wiadomość skopiowana"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Ustawienia zmienione przez operatora"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Kliknij, by zobaczyć ustawienia alertów o zagrożeniu"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9050ae3..e2ba06b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alertas de emergência sem fios"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alertas de emergência sem fios"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alertas de emergência sem fios"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alertas de emergência sem fios"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alertas de emergência sem fios"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notificação informativa"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"As definições de alertas de emergência não estão disponíveis para este utilizador."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Não existem alertas anteriores."</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Definições"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Eliminar transmissões"</string>
     <string name="message_options" msgid="3178489901903589574">"Opções da mensagem"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ver detalhes"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensagens de difusão"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alertas de emergência"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alertas de emergência não confirmados"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alertas de emergência em chamada de voz"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Alterações das definições de WEA automáticas baseadas no SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Permitir alertas"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Receber notificações de alerta de emergência sem fios"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Lembrete de alerta"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Dizer mensagem de alerta"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Utilize a síntese de voz para dizer mensagens de alertas de emergência sem fios."</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Será reproduzido um som de lembrete com o volume normal"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Histórico de alertas de emergência"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferências de alerta"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avisar acerca de eventos potencialmente fatais"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertas de teste"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receber testes do operador e testes mensais do sistema de alerta de segurança"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Receber um alerta de emergência: mensagem de simulação/exercício"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Receber alerta de emergência: operador definido"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibração"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Alertar sempre no volume máximo"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorar o modo Não incomodar e outras definições de volume"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Transmissões de atualização de área"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Tempo de espera máximo:"</string>
     <string name="seconds" msgid="141450721520515025">"segundos"</string>
     <string name="message_copied" msgid="6922953753733166675">"Mensagem copiada."</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Definições alteradas pelo operador"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Toque para ver definições de alertas de emergência sem fios"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 895e052..faab43c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alertas de emergência sem fio"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alertas de emergência sem fio"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alertas de emergência sem fio"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alertas de emergência sem fio"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alertas de emergência sem fio"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notificação com informação"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Os alertas de emergência sem fio não estão disponíveis para este usuário"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Não há alertas anteriores"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Configurações"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Excluir transmissões"</string>
     <string name="message_options" msgid="3178489901903589574">"Opções de mensagem"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ver detalhes"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Transmitir mensagens"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alertas de emergência"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alertas de emergência ignorados"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alertas de emergência em chamadas de voz"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Mudanças automáticas nas configurações sem fio do alerta de emergência com base no chip"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Permitir alertas"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Receber notificações de alertas de emergência sem fio"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Lembrete de alerta"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Falar mensagem de alerta"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Usar conversão de texto em voz para falar mensagens de alerta de emergência sem fio"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Um som de lembrete tocará em volume normal"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Histórico de alertas de emergência"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferências de alertas"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Aviso sobre eventos perigosos"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alertas de teste"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Receber testes mensais e da operadora pelo sistema de alerta de segurança"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Receber alerta de emergência: mensagem de treinamento/prática"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Receber alerta de segurança: operador definido"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibração"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Sempre tocar no volume máximo"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorar \"Não perturbe\" e outras configurações de volume"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Transmissões de atualização de área"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Tempo máximo de espera:"</string>
     <string name="seconds" msgid="141450721520515025">"segundos"</string>
     <string name="message_copied" msgid="6922953753733166675">"Mensagem copiada"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Configurações mudadas pela operadora"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Toque para ver as configurações sem fio do alerta de emergência"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c544722..3935750 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Alerte de urgență wireless"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Alerte de urgență wireless"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Alerte de urgență wireless"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Alerte de urgență wireless"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Alerte de urgență wireless"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notificare informativă"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Setările pentru alerte de urgență wireless nu sunt disponibile pentru acest utilizator"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Nu există alerte anterioare"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Setări"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Ștergeți difuzările"</string>
     <string name="message_options" msgid="3178489901903589574">"Opțiuni mesaj"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Afișați detaliile"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerte"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesaje privind difuzarea"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Alerte de urgență"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Alerte de urgență neconfirmate"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Alerte de urgență într-un apel vocal"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Setările pentru alertele de urgență wireless au fost modificate automat pe baza cardului SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Permiteți alertele"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Primiți notificări privind alertele de urgență wireless"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Memento alerte"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Rostește mesajele de alertă"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Folosiți funcția de redare vocală a textului pentru a comunica mesajele alertelor de urgență wireless"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Un sunet de memento va fi redat la volumul obișnuit"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Istoricul alertelor de urgență"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferințe pentru alerte"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Avertizează cu privire la evenimentele care pun în pericol viața"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Alerte de testare"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Trimite teste de la operator și teste lunare de la sistemul de alertă privind siguranța"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Primiți alerta de urgență: mesaj de exercițiu/simulare"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Primiți alerte de urgență: definite de operator"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrație"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Trimite întotdeauna alerte la volumul maxim"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignoră funcția Nu deranja și alte setări pentru volum"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Difuzarea actualizărilor despre zonă"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Timpul maxim de așteptare:"</string>
     <string name="seconds" msgid="141450721520515025">"secunde"</string>
     <string name="message_copied" msgid="6922953753733166675">"Mesajul a fost copiat"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Setările au fost modificate de către operator"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Atingeți ca să vedeți setările pentru alertele de urgență wireless"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ca39a62..ac00156 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"Настройки"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Удалить трансляции"</string>
     <string name="message_options" msgid="3178489901903589574">"Параметры сообщения"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Детали"</string>
@@ -52,10 +57,14 @@
     <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">"Автоматические настройки экстренных оповещений по беспроводным сетям изменены согласно 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">"Использовать озвучивание текста для чтения экстренных оповещений по беспроводным сетям"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Аварийные оповещения"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 66b0e9e..1852641 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"සැකසීම්"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"විකාශන මකන්න"</string>
     <string name="message_options" msgid="3178489901903589574">"පණිවිඩ විකල්ප"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"විස්තර බලන්න"</string>
@@ -52,10 +57,14 @@
     <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">"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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ප්‍රදේශ යාවත්කාලීන විකාශන"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d4d3635..6c3f1f2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Bezdrôtové tiesňové upozornenia"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Bezdrôtové tiesňové upozornenia"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Bezdrôtové núdzové upozornenia"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Bezdrôtové núdzové upozornenia"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Bezdrôtové núdzové upozornenia"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informačné upozornenie"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Bezdrôtové tiesňové upozornenia nie sú pre tohto používateľa dostupné"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Žiadne predchádzajúce upozornenia"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Nastavenia"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Odstrániť vysielania"</string>
     <string name="message_options" msgid="3178489901903589574">"Možnosti správy"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Zobraziť podrobnosti"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozornenia"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Správy vysielania"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Tiesňové upozornenia"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nepotvrdené tiesňové upozornenia"</string>
     <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í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>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Zvuk pripomenutí sa prehrá bežnou hlasitosťou"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"História tiesňových upozornení"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Nastavenia upozornení"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Upozorňovať na udalosti ohrozujúce život"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testovacie upozornenia"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Dostávať testy od operátora a mesačné testy zo systému bezpečnostných upozornení"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Dostávať tiesňové upozornenie: správa o cvičení"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Prijímanie tiesňových upozornení: definované operátorom"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibrácie"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Upozornenia vždy prehrávať pri plnej hlasitosti"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorovať režim bez vyrušení a ďalšie nastavenia hlasitosti"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Vysielania s aktuálnymi informáciami oblasti"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximálny čas čakania:"</string>
     <string name="seconds" msgid="141450721520515025">"s"</string>
     <string name="message_copied" msgid="6922953753733166675">"Správa bola skopírovaná"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Nastavenia zmenil operátor"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Klepnutím zobrazíte nastavenia bezdrôtového tiesňového upozornenia"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 83e3d3d..a9812fa 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Brezžična nujna opozorila"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Brezžična nujna opozorila"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Brezžična nujna opozorila"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Brezžična nujna opozorila"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Brezžična nujna opozorila"</string>
+    <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="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>
     <string name="menu_view_details" msgid="1040989019045280975">"Ogled podrobnosti"</string>
@@ -52,21 +57,25 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Opozorila"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sporočila mobilnega operaterja"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Nujna opozorila"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Nujna obvestila brez potrditve prejema"</string>
     <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">"Prejemajte obvestila o brezžičnih nujnih opozorilih."</string>
+    <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Prejemanje obvestil 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>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Zvok opomnika bo predvajan pri običajni glasnosti"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Zgodovina nujnih opozoril"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Nastavitve opozoril"</string>
     <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>
@@ -76,8 +85,15 @@
     <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">"Prejemajte preizkuse operaterja in mesečne preizkuse iz sistema varnostnih opozoril."</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Prejemanje preizkusov operaterja in mesečnih preizkusov 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>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Prejemanje opozorila v sili: Po pravilih operaterja"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Vibriranje"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Opozarjanje vedno pri polni glasnosti"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Prezrtje načina »ne moti« in drugih nastavitev glasnosti"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Oddaje z najnovejšimi območnimi informacijami"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Najdaljši čas čakanja:"</string>
     <string name="seconds" msgid="141450721520515025">"sekunde"</string>
     <string name="message_copied" msgid="6922953753733166675">"Sporočilo je kopirano"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Operater je spremenil nastavitve"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Dotaknite se za ogled nastavitev brezžičnih nujnih opozoril"</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 87ae4ca..09849db 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Sinjalizimet me valë të urgjencës"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Sinjalizimet me valë të urgjencës"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Sinjalizimet me valë të urgjencës"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Sinjalizimet me valë të urgjencës"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Sinjalizimet me valë të urgjencës"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Njoftim informues"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Cilësimet e sinjalizimeve me valë të urgjencës nuk ofrohen për këtë përdorues"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Në rregull"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Asnjë alarm i mëparshëm"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Cilësimet"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Fshi transmetimet"</string>
     <string name="message_options" msgid="3178489901903589574">"Opsionet e mesazhit"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Shiko detajet"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Sinjalizimet"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesazhet e transmetimit"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Sinjalizimet e urgjencës"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Sinjalizimet e pakonfirmuara të sigurisë"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Sinjalizimet e urgjencës në telefonatë zanore"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Cilësimet automatike të WEA-s janë ndryshuar në bazë të kartës SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Lejo sinjalizimet"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Merr njoftimet e sinjalizimeve me valë të urgjencës"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alarmet rikujtuese"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Dëgjo mesazhin e alarmit"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Përdor tekstin-në-ligjërim që të lexohen me zë mesazhet e sinjalizimeve me valë të urgjencës"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Një tingull alarmi rikujtues do të luhet me volum të rregullt"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historiku i sinjalizimeve të urgjencës"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencat për sinjalizimet"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Paralajmëro për ngjarje kërcënuese për jetën"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Sinjalizime testimi"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Merr testet e operatorit celular dhe testet mujore nga sistemi i sinjalizimeve të sigurisë"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Merr alarmin e urgjencës: Mesazhi i ushtrimit/stërvitjes"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Merr sinjalizimin e urgjencës: Përcaktohet nga operatori"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Dridhje"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Gjithmonë sinjalizo me volum të plotë"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Shpërfill \"Mos shqetëso\" dhe cilësimet e tjera të volumit"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Transmetimet e përditësimeve për zonën"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Koha maksimale e pritjes:"</string>
     <string name="seconds" msgid="141450721520515025">"sekonda"</string>
     <string name="message_copied" msgid="6922953753733166675">"Mesazhi u kopjua"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Cilësimet janë ndryshuar nga operatori celular"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Trokit për të parë cilësimet e sinjalizimeve me valë të urgjencës"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index bdd2b16..0ee537d 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"Подешавања"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Избриши емитовања"</string>
     <string name="message_options" msgid="3178489901903589574">"Опције порука"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Прикажи детаље"</string>
@@ -52,10 +57,14 @@
     <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">"Аутоматске промене подешавања бежичних упозорења о хитним случајевима на основу 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">"Користи претварање текста у говор за изговарање порука бежичних обавештења о хитним случајевима"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Обавештења о ажурирању подручја"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c1c64cb..cde326d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Trådlösa varningar vid nödsituationer"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Trådlösa varningar vid nödsituationer"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Trådlösa varningar vid nödsituationer"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Trådlösa varningar vid nödsituationer"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Trådlösa varningar vid nödsituationer"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Informativ avisering"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Den här användaren har inte åtkomst till inställningarna för trådlösa varningar vid nödsituationer"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Inga tidigare varningar"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Inställningar"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Ta bort sändningar"</string>
     <string name="message_options" msgid="3178489901903589574">"Meddelandealternativ"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Visa mer information"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Varningar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sändningsmeddelanden"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Varningar vid nödsituationer"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Inte erkända varningar vid nödsituationer"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Varningar vid nödsituationer under röstsamtal"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"De automatiska inställningarna för systemet med trådlösa varningar ändras utifrån SIM-kortet"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Tillåt varningar"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Få aviseringar om nödsituationer trådlöst"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Påminnelse"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Tala in varningsmeddelande"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Använd text till tal när du vill tala in trådlösa varningar vid nödsituationer"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Påminnelseljudet spelas upp på normal volym"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Varningshistorik"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Varningsinställningar"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Varna om livshotande händelser"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Testvarningar"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Ta emot tester från operatören och månadstester från systemet för säkerhetsvarningar"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Ta emot varningar om nödsituation: övnings-/testmeddelande"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Ta emot varning om nödsituation: definierad operatör"</string>
     <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">"Spela alltid upp varningar på högsta volym"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ignorera Stör ej och andra volyminställningar"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Sändningar för områdesuppdateringar"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Längsta väntetid:"</string>
     <string name="seconds" msgid="141450721520515025">"sekunder"</string>
     <string name="message_copied" msgid="6922953753733166675">"Meddelandet har kopierats"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Inställningarna har ändrats av operatören"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Tryck för att visa inställningar för trådlösa varningar vid nödsituationer"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 51b07e9..e1fdb9c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Arifa za dharura kupitia vifaa visivyotumia waya"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Arifa za dharura kupitia vifaa visivyotumia waya"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Arifa za dharura kupitia vifaa visivyotumia waya"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Arifa za dharura kupitia vifaa visivyotumia waya"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Arifa za dharura kupitia vifaa visivyotumia waya"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Arifa ya maelezo"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Mipangilio ya arifa za dharura kupitia vifaa visivyotumia waya haipatikani kwa mtumiaji huyu"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Sawa"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Hakuna arifa za awali"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Mipangilio"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Futa matangazo"</string>
     <string name="message_options" msgid="3178489901903589574">"Chaguo za ujumbe"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ona maelezo"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Arifa"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Ujumbe kwa wapokeaji wengi"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Arifa za dharura"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Arifa Zisizokubaliwa za Dharura"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Arifa za dharura kupitia simu ya sauti"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Mabadiliko otomatiki ya mipangilio ya WEA kulingana na SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Ruhusu arifa"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Pokea arifa za dharura kupitia vifaa visivyotumia waya"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Kikumbusho cha arifa"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Tamka ujumbe wa ilani"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Tumia kipengele cha kusoma maandishi kwa sauti ili usome ujumbe wa arifa za dharura"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Sauti ya kikumbusho itacheza kwa kiwango cha kawaida cha sauti"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historia ya arifa za dharura"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Mapendeleo ya arifa"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Itoe tahadhari kuhusu matukio yanayohatarisha maisha"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Arifa za majaribio"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Pokea majaribio ya mtoa huduma na majaribio ya kila mwezi kutoka mfumo wa arifa za usalama"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Pokea arifa ya dharura: Ujumbe wa mazoezi"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Pokea arifa ya dharura: Inayobainishwa na mtoa huduma"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Mtetemo"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Arifu kwa sauti kamili kila wakati"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Puuza hali ya Usinisumbue na mipangilio mingine ya sauti"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Matangazo ya taarifa ya eneo"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Muda wa juu zaidi wa kusubiri:"</string>
     <string name="seconds" msgid="141450721520515025">"sekunde"</string>
     <string name="message_copied" msgid="6922953753733166675">"Ujumbe umenakiliwa"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Mipangilio imebadilishwa na mtoa huduma"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Gusa ili uangalie mipangilio ya arifa za dharura kupitia vifaa visivyotumia waya"</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 1df8337..fbd3099 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"அமைப்பு"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"அலைபரப்புகளை நீக்கு"</string>
     <string name="message_options" msgid="3178489901903589574">"செய்தி விருப்பங்கள்"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"விவரங்களைக் காட்டு"</string>
@@ -52,12 +57,16 @@
     <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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"பகுதி பற்றிய புதிய பிராட்காஸ்ட் அறிவிப்புகள்"</string>
@@ -121,7 +137,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>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index d895a05..554e312 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"సెట్టింగ్‌లు"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ప్రసారాలను తొలగించు"</string>
     <string name="message_options" msgid="3178489901903589574">"సందేశ ఎంపికలు"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"వివరాలను వీక్షించండి"</string>
@@ -52,10 +57,14 @@
     <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">"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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ప్రాంతీయ అప్‌డేట్ ప్రసారాలు"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a80ef5b..8310a36 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"การตั้งค่า"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ลบการแจ้งเตือนทั้งหมด"</string>
     <string name="message_options" msgid="3178489901903589574">"ตัวเลือกข้อความ"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"ดูรายละเอียด"</string>
@@ -52,10 +57,14 @@
     <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 เปลี่ยนแปลงตาม 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">"ใช้การอ่านออกเสียงข้อความเพื่ออ่านข้อความแจ้งเหตุฉุกเฉินแบบไร้สาย"</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>
@@ -65,7 +74,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ภัยคุกคามต่อชีวิตและทรัพย์สินระดับสูงสุด"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ภัยคุกคามที่ร้ายแรง"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ภัยคุกคามต่อชีวิตและทรัพย์สินระดับรุนแรง"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"การแจ้งเตือนเด็กหาย Amber Alert"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"การเผยแพร่การอัปเดตในพื้นที่"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index d61a301..df684c2 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Mga wireless na alerto sa emergency"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Mga wireless na alerto sa emergency"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Mga wireless na alerto sa emergency"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Mga wireless na alerto sa emergency"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Mga wireless na alerto sa emergency"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Notification ng impormasyon"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Hindi available ang mga wireless na alerto sa emergency para sa user na ito"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Walang nakaraang alerto"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Mga Setting"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"I-delete ang mga broadcast"</string>
     <string name="message_options" msgid="3178489901903589574">"Mga pagpipilian sa mensahe"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Tingnan ang mga detalye"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Mga Alerto"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mga mensahe ng broadcast"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Mga alerto sa emergency"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Mga hindi pinansing Alerto sa emergency"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Mga emergency na alerto sa voice call"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Mga awtomatikong pagbabago sa Mga Setting ng WEA batay sa SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Payagan ang mga alerto"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Tumanggap ng wireless emergency alert notification"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alertong paalala"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Magsalita ng mensaheng alerto"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Gamitin ang text-to-speech para magsabi ng mga mensahe ng wireless na alerto sa emergency"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"May magpe-play na tunog ng paalala sa regular na volume"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"History ng alertong pang-emergency"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Mga kagustuhan sa alerto"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Magbabala tungkol sa mga nakamamatay na event"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Mga pansubok na alerto"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Makatanggap ng mga pansubok ng carrier at buwanang pagsubok mula sa system ng alerto sa kaligtasan"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Makatanggap ng pang-emergency na alerto: Mensahe sa pagsasanay/drill"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Makatanggap ng alertong pang-emergency: Tinukoy ng operator"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Pag-vibrate"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Palaging alerto sa pinakamalakas na volume"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Balewalain, Huwag Istorbohin at iba pang setting ng volume"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Mga broadcast sa pag-update sa lugar"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maximum na tagal ng paghihintay:"</string>
     <string name="seconds" msgid="141450721520515025">"segundo"</string>
     <string name="message_copied" msgid="6922953753733166675">"Nakopya ang mensahe"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Binago ng carrier ang mga setting"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"I-tap para makita ang mga setting ng wireless na alertong pang-emergency"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 5265d35..f9a4eb6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Kablosuz acil durum uyarıları"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Kablosuz acil durum uyarıları"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Kablosuz acil durum uyarıları"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Kablosuz acil durum uyarıları"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Kablosuz acil durum uyarıları"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Bilgilendirme amaçlı bildirim"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Kablosuz acil durum uyarısı ayarları bu kullanıcı için kullanılamaz"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Tamam"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Henüz uyarı yok"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Ayarlar"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Yayınları sil"</string>
     <string name="message_options" msgid="3178489901903589574">"İleti seçenekleri"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Ayrıntıları görüntüle"</string>
@@ -52,11 +57,15 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Uyarılar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Yayın mesajları"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Acil durum uyarıları"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Onaylanmamış Acil Durum uyarıları"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Sesli aramada acil durum uyarıları"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Otomatik WEA Ayarları SIM\'e göre değişir"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Uyarılara izin ver"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Kablosuz acil durum uyarısı bildirimlerini alın"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Uyarı hatırlatıcı"</string>
-    <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Hatırlatma sesi normal ses düzeyinde aşağıdaki gibi çalacak:"</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="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>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Hayati tehlike yaratabilecek olaylar hakkında uyarılar alın"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Test amaçlı uyarılar"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Güvenlik uyarı sisteminden operatör testi ve aylık test mesajları alın"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Acil durum uyarısı alın: Alıştırma/Tatbikat mesajı"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Acil durum uyarısını al: Operatör tanımlı"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Titreşim"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Uyarıyı her zaman en yüksek düzeyde çal"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Rahatsız Etmeyin ve diğer ses düzeyi ayarlarını yoksay"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Alan güncelleme yayınları"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimum bekleme süresi:"</string>
     <string name="seconds" msgid="141450721520515025">"saniye"</string>
     <string name="message_copied" msgid="6922953753733166675">"Mesaj kopyalandı"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Ayarlar, operatör tarafından değiştirildi"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Kablosuz acil durum uyarısı ayarlarını görmek için dokunun"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 32329ba..f30e7aa 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -18,9 +18,14 @@
     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="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">"OK"</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>
     <string name="menu_view_details" msgid="1040989019045280975">"Переглянути деталі"</string>
@@ -52,10 +57,14 @@
     <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">"Автоматичні налаштування бездротових екстрених сповіщень змінено на основі 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">"Використовувати синтез мовлення, щоб озвучувати текст бездротових екстрених сповіщень"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Широкомовні сповіщення про регіональні оновлення"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index f842c4d..2c13308 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"ترتیبات"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"براڈکاسٹس حذف کریں"</string>
     <string name="message_options" msgid="3178489901903589574">"پیغام کے اختیارات"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"تفصیلات دیکھیں"</string>
@@ -52,12 +57,16 @@
     <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">"‏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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"علاقائی اپ ڈیٹ کے نشریات"</string>
@@ -121,7 +137,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>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index a0b8a3f..dc205d3 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Favqulodda ogohlantirishlar"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Favqulodda ogohlantirishlar"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Aholini ogohlantirish"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Aholini ogohlantirish"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Aholini ogohlantirish"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Axborotli bildirishnoma"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Simsiz tarmoqlar orqali favqulodda ogohlantirish sozlamalari bu foydalanuvchi uchun yopiq"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Hech qanday ogohlantirish topilmadi"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Sozlamalar"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Tarqatma xabarlarni o‘chirish"</string>
     <string name="message_options" msgid="3178489901903589574">"Xabar sozlamalari"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Tafsilotlar"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Ogohlantirishlar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Tarqatma xabarlar"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Favqulodda ogohlantirishlar"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Tasdiqlanmagan favqulodda ogohlantirishlar"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Ovozli chaqiruvlar vaqtida favqulodda ogohlantirish"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Favqulodda simsiz ogohlantirish (WEA) sozlmalari SIM karta asosida avtomatik oʻzgartirildi"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Ogohlantirishlarga ruxsat"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Simsiz tarmoqlar orqali favqulodda ogohlantirishlarni qabul qilish"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Eslatmalar davriyligi"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ogohlantirish xabarini ijro qilish"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Simsiz favqulodda ogohlantirish xabarlarini eshitish uchun matndan-nutqqa vositasidan foydalanish"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Eslatma tovushi odatdagi balandlikda yangraydi"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Favqulodda xabarlar arxivi"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Ogohlantirish parametrlari"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Hayotga xavf soladigan hodisalar haqida ogohlantirilsin"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Sinov xabarlar"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Aloqa operatori va xavfsizlik tizimi uchun majburiy oylik sinov xabarlarini olish"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Favqulodda ogohlantirish olish: oʻquv-mashgʻulot xabari"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Favqulodda ogohlantirish olish: Operator aniqlandi"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Tebranish"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Doim signal maksimal balandlikda yangrasin"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Bezovta qilinmasin va boshqa tovush sozlamalarini rad etish"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Favqulodda ogohlantirishlar"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Maksimal kutish vaqti:"</string>
     <string name="seconds" msgid="141450721520515025">"soniya"</string>
     <string name="message_copied" msgid="6922953753733166675">"Xabar nusxalandi"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Sozlamalar operator tomonidan oʻzgartirildi"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Favqulodda simsiz ogohlantirish sozlamalarini ochish uchun bosing"</string>
 </resources>
diff --git a/res/values-v31/themes.xml b/res/values-v31/themes.xml
new file mode 100644
index 0000000..bba2add
--- /dev/null
+++ b/res/values-v31/themes.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 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>
+  <style name="CellBroadcastAlertTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"/>
+  <style name="CellBroadcastOptOutTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor">
+    <item name="android:windowBackground">@android:color/transparent</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:windowIsTranslucent">true</item>
+  </style>
+
+  <style name="CellBroadcastSettingsTheme" parent="@style/Theme.SubSettingsBase" />
+
+  <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/values-vi/strings.xml b/res/values-vi/strings.xml
index 18ad00d..0719187 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Cảnh báo khẩn cấp không dây"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Cảnh báo khẩn cấp không dây"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Cảnh báo khẩn cấp không dây"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Cảnh báo khẩn cấp qua mạng không dây"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Cảnh báo khẩn cấp qua mạng không dây"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Thông báo cung cấp thông tin"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Người dùng này không được phép thay đổi các tùy chọn cài đặt cảnh báo khẩn cấp không dây"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Không có cảnh báo nào trước đây"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Cài đặt"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Xóa chương trình phát sóng"</string>
     <string name="message_options" msgid="3178489901903589574">"Tùy chọn tin nhắn"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Xem chi tiết"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Cảnh báo"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Thông báo truyền phát"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Cảnh báo khẩn cấp"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Cảnh báo khẩn cấp chưa xác nhận"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Cảnh báo khẩn cấp trong cuộc gọi thoại"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Các tùy chọn cài đặt WEA tự động thay đổi theo SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Cho phép cảnh báo"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Nhận cảnh báo khẩn cấp không dây"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Lời nhắc cảnh báo"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Đọc to nội dung cảnh báo"</string>
+    <string name="enable_alert_speech_summary" msgid="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">"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>
@@ -77,7 +86,14 @@
     <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 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>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Nhận cảnh báo khẩn cấp: Đã xác định nhà cung cấp dịch vụ"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Rung"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Luôn cảnh báo ở mức âm lượng to nhất"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Bỏ qua tùy chọn Không làm phiền và các tùy chọn âm lượng khác"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Chương trình phát sóng thông tin cập nhật khu vực"</string>
@@ -138,7 +154,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ông báo thông thường"</string>
+    <string name="show_regular_messages" msgid="7376885150513522515">"Hiển thị 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>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Thời gian chờ đợi tối đa:"</string>
     <string name="seconds" msgid="141450721520515025">"giây"</string>
     <string name="message_copied" msgid="6922953753733166675">"Đã sao chép thông báo"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Các tùy chọn cài đặt do nhà mạng thay đổi"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Nhấn để xem các tùy chọn cài đặt cảnh báo khẩn cấp không dây"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e22767b..6907c6f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"设置"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"删除广播"</string>
     <string name="message_options" msgid="3178489901903589574">"短信选项"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"查看详情"</string>
@@ -52,10 +57,14 @@
     <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">"基于 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_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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"区域动态信息广播"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a9451d0..7b08dd0 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"設定"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"刪除廣播"</string>
     <string name="message_options" msgid="3178489901903589574">"訊息選項"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"查看詳細資料"</string>
@@ -52,10 +57,14 @@
     <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">"自動無線緊急警報設定會視 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">"使用文字轉語音功能說出無線緊急警示訊息"</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>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"地區最新資訊廣播"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index dbbe0b3..b782d7c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -18,9 +18,14 @@
     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="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="menu_preferences" msgid="3596514894131599202">"設定"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"刪除廣播"</string>
     <string name="message_options" msgid="3178489901903589574">"訊息選項"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"查看詳細資料"</string>
@@ -52,10 +57,14 @@
     <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">"系統已根據 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>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"緊急警報記錄"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"警示偏好設定"</string>
@@ -77,7 +86,14 @@
     <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_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>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"地區更新資訊廣播"</string>
@@ -149,4 +165,6 @@
     <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>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cbc4e20..bcd21da 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -18,9 +18,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2008319089248760277">"Izexwayiso ezingenantambo zesimo esiphuthumayo"</string>
     <string name="sms_cb_settings" msgid="9021266457863671070">"Izexwayiso ezingenantambo zesimo esiphuthumayo"</string>
+    <string name="sms_cb_sender_name_default" msgid="972946539768958828">"Izexwayiso zesimo esiphuthumayo"</string>
+    <string name="sms_cb_sender_name_presidential" msgid="5302753979711319380">"Izexwayiso zesimo esiphuthumayo ezingenantambo"</string>
+    <string name="sms_cb_sender_name_emergency" msgid="2937067842997478965">"Izexwayiso zesimo esiphuthumayo ezingenantambo"</string>
+    <string name="sms_cb_sender_name_public_safety" msgid="5230033387708907922">"Isaziso esingokolwazi"</string>
     <string name="cell_broadcast_settings_not_available" msgid="3908142962162375221">"Izilungiselelo zesexwayiso esingenantambo sesimo esiphuthumayo azitholakaleli lo msebenzisi"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"KULUNGILE"</string>
     <string name="no_cell_broadcasts" msgid="7554779730107421769">"Azikho izexwayiso zangaphambilini"</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Izilungiselelo"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Susa ukusakaza"</string>
     <string name="message_options" msgid="3178489901903589574">"Izinketho zemilayezo"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Buka imininingwane"</string>
@@ -52,10 +57,14 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Izexwayiso"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sakaza imilayezo"</string>
     <string name="notification_channel_emergency_alerts" msgid="5008287980979183617">"Izaziso ezisheshayo"</string>
+    <string name="notification_channel_emergency_alerts_high_priority" msgid="3937475297436439073">"Izexwayiso Eziphuthumayo Ezingamukelwanga"</string>
     <string name="notification_channel_broadcast_messages_in_voicecall" msgid="3291001780110813190">"Izexwayiso zesimo esiphuthumayo kukholi yezwi"</string>
+    <string name="notification_channel_settings_updates" msgid="6779759372516475085">"Amasethingi Azenzakalelayo we-WEA ayashintsha ngokusekelwe ku-SIM"</string>
     <string name="enable_alerts_master_toggle_title" msgid="1457904343636699446">"Vumela izexwayiso"</string>
     <string name="enable_alerts_master_toggle_summary" msgid="5583168548073938617">"Thola izaziso ezingenantambo zezexwayiso zesimo esiphuthumayo"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Isikhumbuzo sesaziso"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Khuluma isaziso somlayezo"</string>
+    <string name="enable_alert_speech_summary" msgid="2855629032890937297">"Sebenzisa ukuguqula-umbhalo-ube inkulumo ukuze ukhulume imilayezo yesexwayiso esingenantambo sesimo esiphuthumayo"</string>
     <string name="alert_reminder_dialog_title" msgid="2299010977651377315">"Umsindo wesikhumbuzi uzodlala ngevolomu evamile"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Umlando wesexwayiso esiphuthumayo"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Izintandokazi zesexwayiso"</string>
@@ -77,7 +86,14 @@
     <string name="enable_emergency_alerts_message_summary" msgid="7574617515441602546">"Xwayisa mayelana nemicimbi esongela ukuphila"</string>
     <string name="enable_cmas_test_alerts_title" msgid="7194966927004755266">"Izexwayiso zohlolo"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2083089933271720217">"Thola ukuhlolwa kwenkampani yenethiwekhi kanye nokuhlolwa kwanjalo ngenyanga kusukela kusistimu yesexwayiso sezokuphepha"</string>
+    <!-- no translation found for enable_exercise_test_alerts_title (6030780598569873865) -->
+    <skip />
+    <string name="enable_exercise_test_alerts_summary" msgid="4276766794979567304">"Thola isexwayiso sesimo esiphuthumayo: Umyalezo wokuphrakthiza/Ukuqeqeshwa"</string>
+    <!-- no translation found for enable_operator_defined_test_alerts_title (7459219458579095832) -->
+    <skip />
+    <string name="enable_operator_defined_test_alerts_summary" msgid="7856514354348843433">"Yamukela isexwayiso sesimo esiphuthumayo: Uhlelo luchaziwe"</string>
     <string name="enable_alert_vibrate_title" msgid="5421032189422312508">"Ukudlidliza"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4733669825477146614"></string>
     <string name="override_dnd_title" msgid="5120805993144214421">"Njalo xwayisa ngevolomu ephezulu"</string>
     <string name="override_dnd_summary" msgid="9026675822792800258">"Ziba okuthi Ungaphazamisi nezinye izilungiselelo zevolomu"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Ukusakazwa kwesibuyekezo sendawo"</string>
@@ -149,4 +165,6 @@
     <string name="maximum_waiting_time" msgid="3504809124079381356">"Isikhathi sokulinda esikhulu:"</string>
     <string name="seconds" msgid="141450721520515025">"amasekhondi"</string>
     <string name="message_copied" msgid="6922953753733166675">"Umlayezo ukopishiwe"</string>
+    <string name="notification_cb_settings_changed_title" msgid="7664799881479966932">"Amasethingi ashintshwe yinkampani yenethiwekhi"</string>
+    <string name="notification_cb_settings_changed_text" msgid="1397646219615654933">"Thepha ukuze ubone amasethingi esixwayiso sokuphuthuma okungaxhunyiwe"</string>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6db24ac..d14bf8c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -21,5 +21,6 @@
 
     <color name="cell_broadcast_color_primary">#ff263238</color>
     <color name="cell_broadcast_color_primary_dark">#ff21272b</color>
+    <color name="ic_launcher_cell_broadcast_background">#FFFFFF</color>
 </resources>
 
diff --git a/res/values/config.xml b/res/values/config.xml
index 26cd140..f9f8157 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -19,6 +19,8 @@
     <bool name="show_override_dnd_settings">false</bool>
     <!-- The default value for overriding dnd settings-->
     <bool name="override_dnd_default">false</bool>
+    <!-- Whether to show main switch settings at the top -->
+    <bool name="show_main_switch_settings">true</bool>
     <!-- Whether to show presidential alert settings -->
     <bool name="show_presidential_alerts_settings">false</bool>
     <!-- Whether to show extreme alert settings -->
@@ -29,8 +31,8 @@
     <bool name="show_amber_alert_settings">true</bool>
     <!-- Whether to show test settings -->
     <bool name="show_test_settings">true</bool>
-    <!-- Whether to append date-time to the alert title -->
-    <bool name="show_date_time_title">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 -->
@@ -41,12 +43,22 @@
     <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. -->
+    <bool name="show_exercise_settings">false</bool>
+    <!-- whether to display a separate exercise test settings. today, most of time, exercise channels was controlled by the main test toggle. -->
+    <bool name="show_separate_exercise_settings">false</bool>
+    <!-- Whether to display operator defined test settings when testing mode is off. -->
+    <!-- This is read only when show_separate_exercise_settings is on -->
+    <bool name="show_operator_defined_settings">false</bool>
+    <!-- whether to display a separate operator defined test settings. today, most of time, operator defined channels was controlled by the main test toggle. -->
+    <bool name="show_separate_operator_defined_settings">false</bool>
+
     <!-- Whether to disable cell broadcast severe alert when extreme alert is disabled -->
     <bool name="disable_severe_when_extreme_disabled">true</bool>
-    <!-- Whether to bypass test alert settings and always enable exercise alert channel -->
-    <bool name="always_enable_exercise_alert">false</bool>
     <!-- Whether to enable alert handling during active voice call. -->
     <bool name="enable_alert_handling_during_call">false</bool>
     <!-- Whether the user can mute the alert by physical button -->
@@ -57,6 +69,10 @@
     <bool name="allow_testing_mode_on_user_build">true</bool>
     <!-- Whether to save alerts to sms inbox database -->
     <bool name="enable_write_alerts_to_sms_inbox">false</bool>
+    <!-- Whether to always mark sms read -->
+    <bool name="always_mark_sms_read">false</bool>
+    <!-- Whether to retry message history data migration after db creation -->
+    <bool name="retry_message_history_data_migration">false</bool>
 
     <!-- Section for switch default value -->
     <!-- Main toggle default value -->
@@ -71,10 +87,17 @@
     <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 -->
     <bool name="test_alerts_enabled_default">false</bool>
+    <!-- Exercise test alerts toggle default value -->
+    <bool name="test_exercise_alerts_enabled_default">false</bool>
+    <!-- Operator defined test alerts toggle default value -->
+    <bool name="test_operator_defined_alerts_enabled_default">false</bool>
+
     <!-- Area info toggle default value -->
     <bool name="area_update_info_alerts_enabled_default">true</bool>
     <!-- Show area update info settings in CellBroadcastReceiver and information in SIM status in Settings app -->
@@ -82,15 +105,21 @@
     <bool name="config_showAreaUpdateInfoSettings">false</bool>
     <!-- Show cellbroadcast message history entry point in the application launcher.-->
     <bool name="show_message_history_in_launcher">false</bool>
+    <!-- Allow user to enable/disable audio speech alert (text-to-speech for received messages)-->
+    <bool name="show_alert_speech_setting">false</bool>
+    <!-- always overriding dnd settings: Play alert sound in full volume regardless DND is on. Applied to all channels -->
+    <bool name="override_dnd">false</bool>
+    <!-- Default value which determines whether spoken alerts enabled -->
+    <bool name="enable_alert_speech_default">true</bool>
 
     <!-- Specify second language code to receive emergency alerts -->
     <string name="emergency_alert_second_language_code" translatable="false"></string>
     <!-- 4370, 4383 -->
     <string-array name="cmas_presidential_alerts_channels_range_strings" translatable="false">
-        <item>0x1112:rat=gsm, emergency=true</item>
-        <item>0x1000:rat=cdma, emergency=true</item>
+        <item>0x1112:rat=gsm, emergency=true, always_on=true</item>
+        <item>0x1000:rat=cdma, emergency=true, always_on=true</item>
         <!-- additional language -->
-        <item>0x111F:rat=gsm, emergency=true</item>
+        <item>0x111F:rat=gsm, emergency=true, always_on=true</item>
     </string-array>
     <!-- 4371~4372, 4384~4385 -->
     <string-array name="cmas_alert_extreme_channels_range_strings" translatable="false">
@@ -191,10 +220,22 @@
         <item>1000</item>
     </integer-array>
 
+    <!-- Vibrator pattern to be used as the default for notifications copy of
+    config_defaultNotificationVibePattern -->
+    <integer-array name="default_notification_vibration_pattern">
+        <item>0</item>
+        <item>350</item>
+        <item>250</item>
+        <item>350</item>
+    </integer-array>
+
     <!-- Value of the first reminder interval in minutes. 0 means using one of the
          alert_reminder_interval_values for the interval of first reminder -->
     <integer name="first_reminder_interval_in_min">0</integer>
 
+    <!-- Whether to disable the opt-out dialog for all channels -->
+    <bool name="disable_opt_out_dialog">false</bool>
+
     <!-- Whether the emergency alert notification is non-swipeable -->
     <bool name="non_swipeable_notification">false</bool>
 
@@ -207,4 +248,25 @@
 
     <!-- Whether enabling copy message text into clipboard by long press -->
     <bool name="enable_text_copy">true</bool>
+
+    <!-- Whether to override the language of the alert dialog's title to match the message locale -->
+    <bool name="override_alert_title_language_to_match_message_locale">false</bool>
+
+    <!-- Whether to display a notification with the pop-up dialog in the foreground when the device
+    has active connections to companion devices.
+    TODO: enable this feature by default in the future. -->
+    <bool name="show_notification_if_connected_to_companion_devices">false</bool>
+
+    <!-- Whether to display a notification with pop-up dialog in the foreground.
+    KR carriers mandate to always show notifications along with alert dialog.  -->
+    <bool name="show_alert_dialog_with_notification">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>
+
+    <!-- String used to override message body for certain service categories.
+         The format for each entry is: "service_category:message".
+         '>' is a special character which indicates that the carrier's name should be shown -->
+    <string-array name="message_body_override" translatable="false"></string-array>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index b873307..032f024 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -23,5 +23,7 @@
     <dimen name="alert_dialog_title_height">64dip</dimen>
     <!-- Dialog button bar height -->
     <dimen name="alert_dialog_button_bar_height">48dip</dimen>
+    <!-- Max height of alert dialog's text content -->
+    <dimen name="alert_dialog_maxheight_content_panel">0dip</dimen>
 
 </resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
new file mode 100644
index 0000000..059ab34
--- /dev/null
+++ b/res/values/ids.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--These IDs are defined here so that they could be overlayed by OEMs -->
+    <!--IDs used by CellBroadcastAlertDialog-->
+    <item type="id" name="parentPanel"/>
+    <item type="id" name="topPanel"/>
+    <item type="id" name="titleDividerTop"/>
+    <item type="id" name="title_template"/>
+    <item type="id" name="icon"/>
+    <item type="id" name="alertTitle"/>
+    <item type="id" name="titleDivider"/>
+    <item type="id" name="contentPanel"/>
+    <item type="id" name="scrollView"/>
+    <item type="id" name="message"/>
+    <item type="id" name="pictogramPanel"/>
+    <item type="id" name="pictogramImage"/>
+    <item type="id" name="buttonPanel"/>
+    <item type="id" name="dismissButton"/>
+
+</resources>
diff --git a/res/values/overlayable.xml b/res/values/overlayable.xml
index fbfee87..1fe63db 100644
--- a/res/values/overlayable.xml
+++ b/res/values/overlayable.xml
@@ -23,13 +23,56 @@
         <policy type="product|system|vendor">
             <!-- START THEME / STYLE -->
             <item type="style" name="CellBroadcastAlertTheme"/>
+            <item type="style" name="CellBroadcastOptOutTheme"/>
             <item type="style" name="CellBroadcastListActivityTheme"/>
             <item type="style" name="CellBroadcastSettingsTheme"/>
+
+            <!-- All attributes defined in app level need to exposed to overlay the AlerDialog and
+                 CellBroadcastAlertDialog layouts -->
+            <item type="attr" name="preferenceFragmentCompatStyle"/>
+            <item type="attr" name="switchPreferenceStyle"/>
+            <item type="attr" name="preferenceCategoryStyle"/>
+            <item type="attr" name="preferenceStyle"/>
+            <item type="attr" name="dialogPreferenceStyle"/>
+
+            <item type="attr" name="preferenceTheme"/>
+            <item type="attr" name="allowDividerAfterLastItem"/>
+            <item type="attr" name="allowDividerAbove"/>
+            <item type="attr" name="allowDividerBelow"/>
+            <item type="attr" name="singleLineTitle"/>
+
+            <item type="attr" name="alertDialogTheme"/>
+            <item type="attr" name="alertDialogStyle"/>
+            <item type="attr" name="listLayout"/>
+            <item type="attr" name="listItemLayout"/>
+            <item type="attr" name="multiChoiceItemLayout"/>
+            <item type="attr" name="singleChoiceItemLayout"/>
+
+            <item type="attr" name="windowActionBar"/>
+            <item type="attr" name="colorAccent"/>
+
+            <!-- Declare the IDs used in overlayable layouts like CellBroadcastAlertDialog -->
+            <item type="id" name="parentPanel"/>
+            <item type="id" name="topPanel"/>
+            <item type="id" name="titleDividerTop"/>
+            <item type="id" name="title_template"/>
+            <item type="id" name="icon"/>
+            <item type="id" name="alertTitle"/>
+            <item type="id" name="titleDivider"/>
+            <item type="id" name="contentPanel"/>
+            <item type="id" name="scrollView"/>
+            <item type="id" name="message"/>
+            <item type="id" name="pictogramPanel"/>
+            <item type="id" name="pictogramImage"/>
+            <item type="id" name="buttonPanel"/>
+            <item type="id" name="dismissButton"/>
             <!-- END THEME / STYLE -->
 
             <!-- START DIMEN -->
             <item type="dimen" name="alert_dialog_title_height"/>
             <item type="dimen" name="alert_dialog_button_bar_height"/>
+            <!-- Max height of alert dialog's text content -->
+            <item type="dimen" name="alert_dialog_maxheight_content_panel"/>
             <!-- END DIMEN -->
 
             <!-- START COLOR -->
@@ -52,12 +95,208 @@
             but only for certain products. OEMs can customize below config by including 0xA807
             or not per product configuration-->
             <item type="array" name="additional_cbs_channels_strings" />
+
+            <!-- Allow OEM to customize link_method. By default, use smart
+            linkify except for countries which do not allow link copy. -->
+            <!-- Text links generating method. Could be one of the followings.
+             "none": Not adding any link to message texts.
+             "legacy_linkify": Use the legacy linkify to add links to message texts.
+             "smart_linkify": Use machine learning based smart linkify to add
+             links to message texts.
+             "smart_linkify_no_copy: Use machine learning based smart linkify but
+             hipe copy menu-->
+            <item type="string" name="link_method" />
             <!-- END CHANNEL related configurations -->
 
             <!-- Some countries like KR requires to display CB messages inside SMS inbox.
             allow customization for sms sender name -->
-            <item type="string" name="sms_cb_sender_name" />
+            <item type="string" name="sms_cb_sender_name_default" />
+            <!-- Value of sms sender display name to be shown in SMS inbox for presidential alerts -->
+            <item type="string" name="sms_cb_sender_name_presidential" />
+            <!-- Value of sms sender display name to be shown in SMS inbox for emergency alerts -->
+            <!-- mapping to emergency_alerts_channels_range_strings channel range -->
+            <item type="string" name="sms_cb_sender_name_emergency" />
+            <!-- Value of sms sender display name to be shown in SMS inbox for public safety alerts -->
+            <item type="string" name="sms_cb_sender_name_public_safety" />
             <item type="bool" name="enable_write_alerts_to_sms_inbox" />
+            <item type="bool" name="always_mark_sms_read" />
+
+            <!-- Whether to disable the opt-out dialog for all channels -->
+            <item type="bool" name="disable_opt_out_dialog" />
+
+            <!-- Whether to retry message history data migration after db creation
+           Note, please only enable this flag when upgrade to R, enabling this
+           flag during OTA might cause history data inserted twice.-->
+            <item type="bool" name="retry_message_history_data_migration" />
+            <!-- Allow user to enable/disable audio speech alert (text-to-speech for received
+            messages)-->
+            <item type="bool" name="show_alert_speech_setting" />
+            <item type="bool" name="show_main_switch_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).-->
+            <item type="bool" name="enable_alert_handling_during_call" />
+
+            <!-- Default value which determines whether spoken alerts enabled -->
+            <item type="bool" name="enable_alert_speech_default" />
+
+            <!-- Default value of whether to display a notification with pop-up dialog in the foreground.
+            KR carriers mandate to always show notifications along with alert dialog. -->
+            <item type="bool" name="show_alert_dialog_with_notification" />
+
+            <!-- Whether to display a notification with the pop-up dialog in the foreground when the
+            device has active connections to companion devices. -->
+            <item type="bool" name="show_notification_if_connected_to_companion_devices" />
+
+            <!-- Whether enable LED flash when playing alert tones -->
+            <item type="bool" name="enable_led_flash" />
+
+            <!-- Whether to show the alert dialog at the bottom of the screen in order to avoid
+                 blocking other content -->
+            <item type="bool" name="alert_dialog_bottom" />
+
+            <!-- Temporarily enable string customization to address translation issues. All translation issues will be fixed in S by upstreaming -->
+            <!-- Dialog title for presidential level alert. [CHAR LIMIT=50] -->
+            <!-- The name of the Cell Broadcast Receiver app. [CHAR LIMIT=NONE] -->
+            <item type="string" name="app_label" />
+            <item type="string" name="sms_cb_settings" />
+            <item type="string" name="cell_broadcast_settings_not_available"/>
+            <item type="string" name="button_dismiss"/>
+            <item type="string" name="no_cell_broadcasts"/>
+            <item type="string" name="menu_preferences"/>
+            <item type="string" name="menu_delete_all"/>
+            <item type="string" name="message_options"/>
+            <item type="string" name="menu_view_details"/>
+            <item type="string" name="menu_delete"/>
+            <item type="string" name="view_details_title"/>
+            <item type="string" name="view_details_debugging_title"/>
+            <item type="string" name="confirm_delete_broadcast"/>
+            <item type="string" name="confirm_delete_all_broadcasts"/>
+            <item type="string" name="button_delete"/>
+            <item type="string" name="button_cancel"/>
+            <item type="string" name="etws_earthquake_warning"/>
+            <item type="string" name="etws_tsunami_warning"/>
+            <item type="string" name="etws_earthquake_and_tsunami_warning"/>
+            <item type="string" name="etws_test_message"/>
+            <item type="string" name="etws_other_emergency_type"/>
+            <item type="string" name="cmas_presidential_level_alert"/>
+            <item type="string" name="cmas_extreme_alert"/>
+            <item type="string" name="cmas_extreme_immediate_observed_alert"/>
+            <item type="string" name="cmas_extreme_immediate_likely_alert"/>
+            <item type="string" name="cmas_severe_alert"/>
+            <item type="string" name="cmas_amber_alert"/>
+            <item type="string" name="cmas_required_monthly_test"/>
+            <item type="string" name="cmas_exercise_alert"/>
+            <item type="string" name="cmas_operator_defined_alert"/>
+            <item type="string" name="pws_other_message_identifiers" />
+            <item type="string" name="cb_other_message_identifiers"/>
+            <item type="string" name="public_safety_message"/>
+            <item type="string" name="state_local_test_alert"/>
+            <item type="string" name="emergency_alert"/>
+            <item type="string" name="emergency_alerts_title"/>
+            <item type="string" name="notification_channel_broadcast_messages"/>
+            <item type="string" name="notification_channel_emergency_alerts"/>
+            <item type="string" name="notification_channel_broadcast_messages_in_voicecall"/>
+            <item type="string" name="enable_alerts_master_toggle_title"/>
+            <item type="string" name="enable_alerts_master_toggle_summary"/>
+            <item type="string" name="alert_reminder_interval_title"/>
+            <item type="string" name="alert_reminder_interval_summary"/>
+            <item type="string" name="alert_reminder_dialog_title"/>
+            <item type="string" name="emergency_alert_history_title"/>
+            <item type="string" name="alert_preferences_title"/>
+            <item type="string" name="enable_etws_test_alerts_title"/>
+            <item type="string" name="enable_etws_test_alerts_summary"/>
+            <item type="string" name="enable_cmas_extreme_threat_alerts_title"/>
+            <item type="string" name="enable_cmas_extreme_threat_alerts_summary"/>
+            <item type="string" name="enable_cmas_severe_threat_alerts_title"/>
+            <item type="string" name="enable_cmas_severe_threat_alerts_summary"/>
+            <item type="string" name="enable_cmas_amber_alerts_title"/>
+            <item type="string" name="enable_cmas_amber_alerts_summary"/>
+            <item type="string" name="enable_alert_message_title"/>
+            <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"/>
+            <item type="string" name="enable_emergency_alerts_message_summary"/>
+            <item type="string" name="enable_cmas_test_alerts_title"/>
+            <item type="string" name="enable_cmas_test_alerts_summary"/>
+            <item type="string" name="enable_alert_vibrate_title"/>
+            <item type="string" name="enable_alert_vibrate_summary"/>
+            <item type="string" name="override_dnd_title"/>
+            <item type="string" name="override_dnd_summary"/>
+            <item type="string" name="enable_area_update_info_alerts_title"/>
+            <item type="string" name="enable_area_update_info_alerts_summary"/>
+
+            <item type="string" name="cmas_category_heading"/>
+            <item type="string" name="cmas_category_geo"/>
+            <item type="string" name="cmas_category_met"/>
+            <item type="string" name="cmas_category_safety"/>
+            <item type="string" name="cmas_category_security"/>
+            <item type="string" name="cmas_category_rescue"/>
+            <item type="string" name="cmas_category_fire"/>
+            <item type="string" name="cmas_category_health"/>
+            <item type="string" name="cmas_category_env"/>
+            <item type="string" name="cmas_category_transport"/>
+            <item type="string" name="cmas_category_infra"/>
+            <item type="string" name="cmas_category_cbrne"/>
+            <item type="string" name="cmas_category_other"/>
+            <item type="string" name="cmas_response_heading"/>
+            <item type="string" name="cmas_response_shelter"/>
+            <item type="string" name="cmas_response_evacuate"/>
+            <item type="string" name="cmas_response_prepare"/>
+            <item type="string" name="cmas_response_execute"/>
+            <item type="string" name="cmas_response_monitor"/>
+            <item type="string" name="cmas_response_avoid"/>
+            <item type="string" name="cmas_response_assess"/>
+            <item type="string" name="cmas_response_none"/>
+            <item type="string" name="cmas_severity_heading"/>
+            <item type="string" name="cmas_severity_extreme"/>
+            <item type="string" name="cmas_severity_severe"/>
+            <item type="string" name="cmas_urgency_heading"/>
+            <item type="string" name="cmas_urgency_immediate"/>
+            <item type="string" name="cmas_urgency_expected"/>
+            <item type="string" name="cmas_certainty_heading"/>
+            <item type="string" name="cmas_certainty_observed"/>
+            <item type="string" name="cmas_certainty_likely"/>
+            <item type="string" name="delivery_time_heading"/>
+            <item type="string" name="notification_multiple"/>
+            <item type="string" name="notification_multiple_title"/>
+            <item type="string" name="show_cmas_opt_out_summary"/>
+            <item type="string" name="show_cmas_opt_out_title"/>
+            <item type="string" name="cmas_opt_out_dialog_text"/>
+            <item type="string" name="cmas_opt_out_button_yes" />
+            <item type="string" name="cmas_opt_out_button_no" />
+            <item type="string" name="cb_list_activity_title" />
+            <item type="string" name="emergency_alert_settings_title_watches" />
+            <item type="string" name="enable_cmas_presidential_alerts_title" />
+            <item type="string" name="enable_cmas_presidential_alerts_summary" />
+            <item type="string" name="receive_cmas_in_second_language_title" />
+            <item type="string" name="receive_cmas_in_second_language_summary" />
+            <item type="string" name="alerts_header_summary" />
+            <item type="string" name="testing_mode_enabled" />
+            <item type="string" name="testing_mode_disabled" />
+            <item type="string" name="show_all_messages" />
+            <item type="string" name="show_regular_messages" />
+            <item type="string" name="message_identifier" />
+            <item type="string" name="message_serial_number" />
+            <item type="string" name="data_coding_scheme" />
+            <item type="string" name="message_content" />
+            <item type="string" name="location_check_time" />
+            <item type="string" name="message_displayed" />
+            <item type="string" name="message_coordinates" />
+            <item type="string" name="maximum_waiting_time" />
+            <item type="string" name="seconds" />
+            <item type="string" name="message_copied" />
+            <item type="string" name="enable_alert_speech_title" />
+            <item type="string" name="enable_alert_speech_summary" />
+            <item type="string" name="enable_exercise_test_alerts_title" />
+            <item type="string" name="enable_exercise_test_alerts_summary" />
+            <item type="string" name="enable_operator_defined_test_alerts_title" />
+            <item type="string" name="enable_operator_defined_test_alerts_summary" />
         </policy>
         <!-- END VENDOR CUSTOMIZATION -->
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e804f05..417f2a3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,8 +23,21 @@
     <!-- Label for settings screen. [CHAR LIMIT=NONE] -->
     <string name="sms_cb_settings">Wireless emergency alerts</string>
 
-    <!-- Value of sms sender display name to be shown in SMS inbox -->
-    <string name="sms_cb_sender_name" translatable="false">Wireless emergency alerts</string>
+    <!-- Value of sms sender default display name to be shown in SMS inbox -->
+    <string name="sms_cb_sender_name_default">Wireless emergency alerts</string>
+
+    <!-- Value of sms sender display name to be shown in SMS inbox for presidential alerts -->
+    <!-- Required Korean (kr) translation for this message: 위급 재난 문자 -->
+    <string name="sms_cb_sender_name_presidential">Wireless emergency alerts</string>
+
+    <!-- Value of sms sender display name to be shown in SMS inbox for emergency alerts -->
+    <!-- mapping to emergency_alerts_channels_range_strings channel range -->
+    <!-- Required Korean (kr) translation for this message: 긴급 재난 문자-->
+    <string name="sms_cb_sender_name_emergency">Wireless emergency alerts</string>
+
+    <!-- Value of sms sender display name to be shown in SMS inbox for public safety alerts -->
+    <!-- Required Korean (kr) translation for this message: 안전 안내 문자-->
+    <string name="sms_cb_sender_name_public_safety">Informational notification</string>
 
     <!-- Error message for users that aren't allowed to modify Cell broadcast settings [CHAR LIMIT=none] -->
     <string name="cell_broadcast_settings_not_available">Wireless emergency alert settings are not available for this user</string>
@@ -35,6 +48,8 @@
     <!-- Text for list view when empty (no broadcasts). [CHAR LIMIT=200] -->
     <string name="no_cell_broadcasts">No previous alerts</string>
 
+    <!-- Menu item for accessing application settings. [CHAR LIMIT=30] -->
+    <string name="menu_preferences">Settings</string>
     <!-- Menu item for deleting all broadcasts. [CHAR LIMIT=30] -->
     <string name="menu_delete_all">Delete broadcasts</string>
 
@@ -108,8 +123,12 @@
     <string name="notification_channel_broadcast_messages">Broadcast messages</string>
     <!-- Notification channel name for a channel containing emergency alert notifications. [CHAR LIMIT=50] -->
     <string name="notification_channel_emergency_alerts">Emergency alerts</string>
+    <!-- Notification channel name for a channel containing emergency alert notifications for unacknowledged alerts. [CHAR LIMIT=50] -->
+    <string name="notification_channel_emergency_alerts_high_priority">Unacknowledged Emergency alerts</string>
     <!-- Notification channel name for a channel containing emergency alert notifications during voice call. [CHAR LIMIT=100] -->
     <string name="notification_channel_broadcast_messages_in_voicecall">Emergency alerts in voice call</string>
+    <!-- Notification channel name for a channel containing info about WEA settings updates. [CHAR LIMIT=100] -->
+    <string name="notification_channel_settings_updates">Automatic WEA Settings changes based on SIM</string>
 
     <!-- Preference title for enable emergency alerts checkbox. [CHAR LIMIT=50] -->
     <string name="enable_alerts_master_toggle_title">Allow alerts</string>
@@ -119,6 +138,10 @@
     <string name="alert_reminder_interval_title">Alert reminder</string>
     <!-- Do not translate. Empty summary for alert reminder (set by CellBroadcastSettings). -->
     <string name="alert_reminder_interval_summary"></string>
+    <!-- Preference title for enable text-to-speech checkbox. [CHAR LIMIT=50] -->
+    <string name="enable_alert_speech_title">Speak alert message</string>
+    <!-- Preference summary for enable text-to-speech checkbox. [CHAR LIMIT=101] -->
+    <string name="enable_alert_speech_summary">Use text-to-speech to speak wireless emergency alert messages</string>
     <!-- Dialog title for alert reminder interval list. [CHAR LIMIT=100] -->
     <string name="alert_reminder_dialog_title">A reminder sound will play at regular volume</string>
     <!-- Preference title for emergency alert history. [CHAR LIMIT=50] -->
@@ -153,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] -->
@@ -166,9 +193,19 @@
     <string name="enable_cmas_test_alerts_title">Test alerts</string>
     <!-- Preference summary for other test alerts checkbox. [CHAR LIMIT=125] -->
     <string name="enable_cmas_test_alerts_summary">Receive carrier tests and monthly tests from the safety alert system</string>
+    <!-- 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">Receive emergency alert: Exercise/Drill message</string>
+    <!-- Preference title for operator defined test alerts checkbox. [CHAR LIMIT=50] -->
+    <string name="enable_operator_defined_test_alerts_title">@string/cmas_operator_defined_alert</string>
+    <!-- Preference summary for operator defined test alerts checkbox. [CHAR LIMIT=125] -->
+    <string name="enable_operator_defined_test_alerts_summary">Receive emergency alert: Operator defined</string>
 
     <!-- Preference title for CMAS vibration on/off. [CHAR LIMIT=50] -->
     <string name="enable_alert_vibrate_title">Vibration</string>
+    <!-- Preference summary for CMAS vibration on/off. [CHAR LIMIT=50] -->
+    <string name="enable_alert_vibrate_summary"></string>
 
     <!-- Preference title for overriding Do Not Disturb. [CHAR LIMIT=50] -->
     <string name="override_dnd_title">Always alert at full volume</string>
@@ -269,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">
@@ -294,7 +335,8 @@
     <!-- Preference summary for enable CMAS second language checkbox. [CHAR LIMIT=100] -->
     <string name="receive_cmas_in_second_language_summary"></string>
 
-    <!-- Preference summary for emergency alert header -->
+    <!-- Preference summary for emergency alert header. For some carriers this is a required
+      "about cell broadcast messages" info preference -->
     <string name="alerts_header_summary"></string>
 
     <!-- Toast message to indicate testing mode is enabled. [CHAR LIMIT=100] -->
@@ -341,4 +383,8 @@
 
     <!-- Emergency alert message copied to clipboard. -->
     <string name="message_copied">Message copied</string>
+
+    <!-- Notification title and text when alerting user that their CB settings have changed -->
+    <string name="notification_cb_settings_changed_title">Settings changed by carrier</string>
+    <string name="notification_cb_settings_changed_text">Tap to see wireless emergency alert settings</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a45112b..94d6cec 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -23,17 +23,23 @@
     <!-- 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>
 
+    <style name="SettingsPreferenceCategory" parent="@style/Preference.Category.Material">
+        <item name="allowDividerAbove">true</item>
+        <item name="allowDividerBelow">true</item>
+        <item name="android:layout">@layout/preference_category_material_settings</item>
+    </style>
+
     <style name="SettingsDialogPreference" parent="SettingsPreference" />
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 059c72f..4a14183 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -19,16 +19,29 @@
 -->
 
 <resources>
-    <style name="CellBroadcastAlertTheme" parent="android:Theme.DeviceDefault.Light.Dialog" />
+    <style name="CellBroadcastAlertTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"/>
+    <style name="CellBroadcastOptOutTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
 
-    <style name="CellBroadcastSettingsTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
+    <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material">
         <item name="switchPreferenceStyle">@style/SettingsSwitchPreference</item>
-        <item name="preferenceCategoryStyle">@style/Preference.Category.Material</item>
+        <item name="preferenceCategoryStyle">@style/SettingsPreferenceCategory</item>
         <item name="preferenceStyle">@style/SettingsPreference</item>
         <item name="dialogPreferenceStyle">@style/SettingsDialogPreference</item>
     </style>
 
+    <!-- have a separate theme for R to guarantee the new
+    CollapsingToolbarBaseActivity does not break R devices-->
+    <style name="CellBroadcastSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings" >
+        <item name="preferenceTheme">@style/PreferenceTheme</item>
+    </style>
+
     <style name="CellBroadcastListActivityTheme" parent="@android:style/Theme.DeviceDefault.Settings">
+        <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 2137894..327e902 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -19,12 +19,13 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    
-    <Preference android:key="alerts_header" 
+
+    <Preference android:key="alerts_header"
                 android:summary="@string/alerts_header_summary"
+                android:icon="@drawable/ic_info_outline_24dp"
                 android:selectable="false" />
-                
-    <SwitchPreference android:defaultValue="@bool/master_toggle_enabled_default"
+
+    <com.android.settingslib.widget.MainSwitchPreference android:defaultValue="@bool/master_toggle_enabled_default"
                       android:key="enable_alerts_master_toggle"
                       android:summary="@string/enable_alerts_master_toggle_summary"
                       android:title="@string/enable_alerts_master_toggle_title" />
@@ -70,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"
@@ -82,6 +89,18 @@
                           android:summary="@string/enable_cmas_test_alerts_summary"
                           android:title="@string/enable_cmas_test_alerts_title" />
 
+        <!-- Enable exercise test alerts -->
+        <SwitchPreference android:defaultValue="@bool/test_exercise_alerts_enabled_default"
+                          android:key="enable_exercise_alerts"
+                          android:summary="@string/enable_exercise_test_alerts_summary"
+                          android:title="@string/enable_exercise_test_alerts_title" />
+
+        <!-- Enable operator defined test alerts -->
+        <SwitchPreference android:defaultValue="@bool/test_operator_defined_alerts_enabled_default"
+                          android:key="enable_operator_defined_alerts"
+                          android:summary="@string/enable_operator_defined_test_alerts_summary"
+                          android:title="@string/enable_operator_defined_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="@bool/area_update_info_alerts_enabled_default"
@@ -101,6 +120,7 @@
 
         <SwitchPreference android:defaultValue="true"
                           android:key="enable_alert_vibrate"
+                          android:summary="@string/enable_alert_vibrate_summary"
                           android:title="@string/enable_alert_vibrate_title" />
 
         <ListPreference android:key="alert_reminder_interval"
@@ -120,5 +140,11 @@
                           android:key="override_dnd"
                           android:summary="@string/override_dnd_summary"
                           android:title="@string/override_dnd_title" />
+
+        <SwitchPreference android:defaultValue="@bool/enable_alert_speech_default"
+                          android:key="enable_alert_speech"
+                          android:summary="@string/enable_alert_speech_summary"
+                          android:title="@string/enable_alert_speech_title" />
     </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/res/xml/watch_preferences.xml b/res/xml/watch_preferences.xml
index 7f9ba0e..7296cae 100644
--- a/res/xml/watch_preferences.xml
+++ b/res/xml/watch_preferences.xml
@@ -37,7 +37,19 @@
                           android:key="enable_cmas_amber_alerts"
                           android:title="@string/enable_cmas_amber_alerts_title" />
 
-        <SwitchPreference android:defaultValue="true"
+        <!-- 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" />
+
+        <com.android.settingslib.widget.MainSwitchPreference android:defaultValue="true"
                           android:key="enable_emergency_alerts"
                           android:title="@string/enable_alerts_master_toggle_title" />
 
@@ -55,6 +67,10 @@
                           android:key="enable_alert_vibrate"
                           android:title="@string/enable_alert_vibrate_title" />
 
+        <SwitchPreference android:defaultValue="true"
+                          android:key="enable_alert_speech"
+                          android:title="@string/enable_alert_speech_title" />
+
         <!-- Enable receive monthly test -->
         <SwitchPreference android:defaultValue="false"
                           android:key="enable_test_alerts"
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index 8b24e26..04a8eb9 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
@@ -20,6 +20,8 @@
 
 import static com.android.cellbroadcastreceiver.CellBroadcastReceiver.DBG;
 
+import android.app.AlarmManager;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
@@ -39,9 +41,11 @@
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
+import android.os.SystemClock;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.speech.tts.TextToSpeech;
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
@@ -59,7 +63,7 @@
  * it can continue to play if another activity overrides the CellBroadcastListActivity.
  */
 public class CellBroadcastAlertAudio extends Service implements TextToSpeech.OnInitListener,
-        TextToSpeech.OnUtteranceCompletedListener {
+        TextToSpeech.OnUtteranceCompletedListener, AudioManager.OnAudioFocusChangeListener {
     private static final String TAG = "CellBroadcastAlertAudio";
 
     /** Action to start playing alert audio/vibration/speech. */
@@ -103,10 +107,14 @@
     private static final int STATE_ALERTING = 1;
     private static final int STATE_PAUSING = 2;
     private static final int STATE_SPEAKING = 3;
+    private static final int STATE_STOPPING = 4;
 
     /** Default LED flashing frequency is 250 milliseconds */
     private static final long DEFAULT_LED_FLASH_INTERVAL_MSEC = 250L;
 
+    /** Default delay for resent alert audio intent */
+    private static final long DEFAULT_RESENT_DELAY_MSEC = 200L;
+
     private int mState;
 
     private TextToSpeech mTts;
@@ -120,6 +128,8 @@
     private boolean mEnableVibrate;
     private boolean mEnableAudio;
     private boolean mEnableLedFlash;
+    private boolean mIsMediaPlayerStarted;
+    private boolean mIsTextToSpeechSpeaking;
     private boolean mOverrideDnd;
     private boolean mResetAlarmVolumeNeeded;
     private int mUserSetAlarmVolume;
@@ -192,9 +202,9 @@
         if (utteranceId.equals(TTS_UTTERANCE_ID)) {
             // When we reach here, it could be TTS completed or TTS was cut due to another
             // new alert started playing. We don't want to stop the service in the later case.
-            if (mState == STATE_SPEAKING) {
+            if (getState() == STATE_SPEAKING) {
                 if (DBG) log("TTS completed. Stop CellBroadcastAlertAudio service");
-                stopSelf();
+                stopAlertAudioService();
             }
         }
     }
@@ -216,15 +226,14 @@
                         if (mMessageBody != null && mTtsEngineReady && mTtsLanguageSupported) {
                             sendMessageDelayed(mHandler.obtainMessage(ALERT_PAUSE_FINISHED),
                                     PAUSE_DURATION_BEFORE_SPEAKING_MSEC);
-                            mState = STATE_PAUSING;
+                            setState(STATE_PAUSING);
                         } else {
                             if (DBG) {
                                 log("MessageEmpty = " + (mMessageBody == null)
                                         + ", mTtsEngineReady = " + mTtsEngineReady
                                         + ", mTtsLanguageSupported = " + mTtsLanguageSupported);
                             }
-                            stopSelf();
-                            mState = STATE_IDLE;
+                            stopAlertAudioService();
                         }
                         // Set alert reminder depending on user preference
                         CellBroadcastAlertReminder.queueAlertReminder(getApplicationContext(),
@@ -240,13 +249,13 @@
 
                             mTts.setAudioAttributes(getAlertAudioAttributes());
                             res = mTts.speak(mMessageBody, 2, null, TTS_UTTERANCE_ID);
-                            mState = STATE_SPEAKING;
+                            mIsTextToSpeechSpeaking = true;
+                            setState(STATE_SPEAKING);
                         }
                         if (res != TextToSpeech.SUCCESS) {
                             loge("TTS engine not ready or language not supported or speak() "
                                     + "failed");
-                            stopSelf();
-                            mState = STATE_IDLE;
+                            stopAlertAudioService();
                         }
                         break;
 
@@ -270,7 +279,7 @@
                 if (state != TelephonyManager.CALL_STATE_IDLE
                         && state != mInitialCallState) {
                     if (DBG) log("Call interrupted. Stop CellBroadcastAlertAudio service");
-                    stopSelf();
+                    stopAlertAudioService();
                 }
             }
         };
@@ -279,6 +288,7 @@
 
     @Override
     public void onDestroy() {
+        setState(STATE_STOPPING);
         // stop audio, vibration and TTS
         if (DBG) log("onDestroy");
         stop();
@@ -297,7 +307,7 @@
             // Release the audio focus so other audio (e.g. music) can resume.
             // Do not do this in stop() because stop() is also called when we stop the tone (before
             // TTS is playing). We only want to release the focus when tone and TTS are played.
-            mAudioManager.abandonAudioFocus(null);
+            mAudioManager.abandonAudioFocus(this);
         }
     }
 
@@ -308,13 +318,35 @@
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        if (DBG) log("onStartCommand");
         // No intent, tell the system not to restart us.
         if (intent == null) {
             if (DBG) log("Null intent. Stop CellBroadcastAlertAudio service");
-            stopSelf();
+            stopAlertAudioService();
             return START_NOT_STICKY;
         }
 
+        // Check if service stop is in progress
+        if (getState() == STATE_STOPPING) {
+            if (DBG) log("stop is in progress");
+            PendingIntent pi;
+            pi = PendingIntent.getService(this, 1 /*REQUEST_CODE_CONTENT_INTENT*/, intent,
+                    PendingIntent.FLAG_ONE_SHOT
+                            | PendingIntent.FLAG_UPDATE_CURRENT
+                            | PendingIntent.FLAG_IMMUTABLE);
+            AlarmManager alarmManager = getSystemService(AlarmManager.class);
+            if (alarmManager == null) {
+                loge("can't get Alarm Service");
+                return START_NOT_STICKY;
+            }
+            if (DBG) log("resent intent");
+            // resent again
+            long triggerTime = SystemClock.elapsedRealtime() + DEFAULT_RESENT_DELAY_MSEC;
+            alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,
+                    triggerTime, pi);
+            return START_STICKY;
+        }
+
         // Get text to speak (if enabled by user)
         mMessageBody = intent.getStringExtra(ALERT_AUDIO_MESSAGE_BODY);
         mMessageLanguage = intent.getStringExtra(ALERT_AUDIO_MESSAGE_LANGUAGE);
@@ -377,7 +409,7 @@
             playAlertTone(mAlertType, mVibrationPattern);
         } else {
             if (DBG) log("No audio/vibrate playing. Stop CellBroadcastAlertAudio service");
-            stopSelf();
+            stopAlertAudioService();
             return START_NOT_STICKY;
         }
 
@@ -489,7 +521,8 @@
                         setDataSourceFromResource(res, mMediaPlayer, R.raw.etws_default);
                         break;
                     case INFO:
-                        setDataSourceFromResource(res, mMediaPlayer, R.raw.info);
+                    case AREA:
+                        mMediaPlayer.setDataSource(this, Settings.System.DEFAULT_NOTIFICATION_URI);
                         break;
                     case TEST:
                     case DEFAULT:
@@ -497,9 +530,17 @@
                         setDataSourceFromResource(res, mMediaPlayer, R.raw.default_tone);
                 }
 
-                // Request audio focus (though we're going to play even if we don't get it)
-                mAudioManager.requestAudioFocus(null, AudioManager.STREAM_ALARM,
-                        AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
+                // Request audio focus (though we're going to play even if we don't get it). The
+                // only scenario we are not getting focus immediately is a voice call is holding
+                // focus, since we are passing AUDIOFOCUS_FLAG_DELAY_OK, the focus will be granted
+                // once voice call ends.
+                mAudioManager.requestAudioFocus(this,
+                        new AudioAttributes.Builder().setLegacyStreamType(
+                                (alertType == AlertType.INFO || alertType == AlertType.AREA) ?
+                                        AudioManager.STREAM_NOTIFICATION
+                                        : AudioManager.STREAM_ALARM).build(),
+                        AudioManager.AUDIOFOCUS_GAIN_TRANSIENT,
+                        AudioManager.AUDIOFOCUS_FLAG_DELAY_OK);
                 mMediaPlayer.setAudioAttributes(getAlertAudioAttributes());
                 setAlertVolume();
 
@@ -509,6 +550,7 @@
                 mMediaPlayer.setLooping(customAlertDuration >= 0);
                 mMediaPlayer.prepare();
                 mMediaPlayer.start();
+                mIsMediaPlayerStarted = true;
 
             } catch (Exception ex) {
                 loge("Failed to play alert sound: " + ex);
@@ -524,8 +566,7 @@
             mHandler.sendMessageDelayed(mHandler.obtainMessage(ALERT_SOUND_FINISHED),
                     customAlertDuration >= 0 ? customAlertDuration : vibrateDuration);
         }
-
-        mState = STATE_ALERTING;
+        setState(STATE_ALERTING);
     }
 
     private static void setDataSourceFromResource(Resources resources,
@@ -585,33 +626,47 @@
 
         resetAlarmStreamVolume();
 
-        if (mState == STATE_ALERTING) {
-            // Stop audio playing
-            if (mMediaPlayer != null) {
-                try {
-                    mMediaPlayer.stop();
-                    mMediaPlayer.release();
-                } catch (IllegalStateException e) {
-                    // catch "Unable to retrieve AudioTrack pointer for stop()" exception
-                    loge("exception trying to stop media player");
-                }
-                mMediaPlayer = null;
+        // Stop audio playing
+        if (mMediaPlayer != null && mIsMediaPlayerStarted) {
+            try {
+                mMediaPlayer.stop();
+                mMediaPlayer.release();
+            } catch (IllegalStateException e) {
+                // catch "Unable to retrieve AudioTrack pointer for stop()" exception
+                loge("exception trying to stop media player");
             }
+            mIsMediaPlayerStarted = false;
+            mMediaPlayer = null;
+        }
 
-            // Stop vibrator
-            mVibrator.cancel();
-            if (mEnableLedFlash) {
-                enableLedFlash(false);
-            }
-        } else if (mState == STATE_SPEAKING && mTts != null) {
+        // Stop vibrator
+        mVibrator.cancel();
+        if (mEnableLedFlash) {
+            enableLedFlash(false);
+        }
+
+        if (mTts != null && mIsTextToSpeechSpeaking) {
             try {
                 mTts.stop();
             } catch (IllegalStateException e) {
                 // catch "Unable to retrieve AudioTrack pointer for stop()" exception
                 loge("exception trying to stop text-to-speech");
             }
+            mIsTextToSpeechSpeaking = false;
         }
-        mState = STATE_IDLE;
+
+        // Service will be destroyed if the state is STATE_STOPPING,
+        // so it should not be changed to another state.
+        if (getState() != STATE_STOPPING) {
+            setState(STATE_IDLE);
+        }
+    }
+
+    @Override
+    public void onAudioFocusChange(int focusChange) {
+        log("onAudioFocusChanged: " + focusChange);
+        // Do nothing, as we don't care if focus was steal from other apps, as emergency alerts will
+        // play anyway.
     }
 
     /**
@@ -621,10 +676,16 @@
         AudioAttributes.Builder builder = new AudioAttributes.Builder();
 
         builder.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION);
-        builder.setUsage(AudioAttributes.USAGE_ALARM);
+        builder.setUsage((mAlertType == AlertType.INFO || mAlertType == AlertType.AREA) ?
+                AudioAttributes.USAGE_NOTIFICATION : AudioAttributes.USAGE_ALARM);
         if (mOverrideDnd) {
             // Set FLAG_BYPASS_INTERRUPTION_POLICY and FLAG_BYPASS_MUTE so that it enables
             // audio in any DnD mode, even in total silence DnD mode (requires MODIFY_PHONE_STATE).
+
+            // Note: this only works when the audio attributes usage is set to USAGE_ALARM. If
+            // regulatory concerns mean that we need to bypass DnD for AlertType.INFO or
+            // AlertType.AREA as well, we'll need to add a config flag to have INFO go over the
+            // alarm stream as well for those jurisdictions in which those regulatory concerns apply
             builder.setFlags(AudioAttributes.FLAG_BYPASS_INTERRUPTION_POLICY
                     | AudioAttributes.FLAG_BYPASS_MUTE);
         }
@@ -670,12 +731,16 @@
      * Set volume of STREAM_ALARM to full.
      */
     private void setAlarmStreamVolumeToFull() {
-        log("setting alarm volume to full for cell broadcast alerts.");
-        int streamType = AudioManager.STREAM_ALARM;
-        mUserSetAlarmVolume = mAudioManager.getStreamVolume(streamType);
-        mResetAlarmVolumeNeeded = true;
-        mAudioManager.setStreamVolume(streamType,
-                mAudioManager.getStreamMaxVolume(streamType), 0);
+        if (mAlertType != AlertType.INFO && mAlertType != AlertType.AREA) {
+            log("setting alarm volume to full for cell broadcast alerts.");
+            int streamType = AudioManager.STREAM_ALARM;
+            mUserSetAlarmVolume = mAudioManager.getStreamVolume(streamType);
+            mResetAlarmVolumeNeeded = true;
+            mAudioManager.setStreamVolume(streamType,
+                    mAudioManager.getStreamMaxVolume(streamType), 0);
+        } else {
+            log("Skipping setting alarm volume to full for alert type INFO and AREA");
+        }
     }
 
     /**
@@ -689,6 +754,35 @@
         }
     }
 
+    /**
+     * Stop CellBroadcastAlertAudio Service and set state to STATE_STOPPING
+     */
+    private void stopAlertAudioService() {
+        if (DBG) log("stopAlertAudioService, current state is " + getState());
+        if (getState() != STATE_STOPPING) {
+            setState(STATE_STOPPING);
+            stopSelf();
+        }
+    }
+
+    /**
+     * Set AlertAudioService state
+     *
+     * @param state service status
+     */
+    private synchronized void setState(int state) {
+        if (DBG) log("Set state from " + mState + " to " + state);
+        mState = state;
+    }
+
+    /**
+     * Get AlertAudioService status
+     * @return service status
+     */
+    private synchronized int getState() {
+        return mState;
+    }
+
     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 77b5c4f..1b3bf33 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
@@ -22,10 +22,15 @@
 import android.app.AlertDialog;
 import android.app.KeyguardManager;
 import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.RemoteAction;
+import android.app.StatusBarManager;
+import android.content.BroadcastReceiver;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
@@ -39,34 +44,43 @@
 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;
+import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.text.util.Linkify;
 import android.util.Log;
 import android.view.Display;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.textclassifier.TextClassification;
+import android.view.textclassifier.TextClassification.Request;
 import android.view.textclassifier.TextClassifier;
 import android.view.textclassifier.TextLinks;
+import android.view.textclassifier.TextLinks.TextLink;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.cellbroadcastreceiver.CellBroadcastChannelManager.CellBroadcastChannelRange;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -77,9 +91,9 @@
 
     private static final String TAG = "CellBroadcastAlertDialog";
 
-    /** Intent extra for non-emergency alerts sent when user selects the notification. */
+    /** Intent extra indicate this intent should not dismiss the notification */
     @VisibleForTesting
-    public static final String FROM_NOTIFICATION_EXTRA = "from_notification";
+    public static final String DISMISS_NOTIFICATION_EXTRA = "dismiss_notification";
 
     // Intent extra to identify if notification was sent while trying to move away from the dialog
     //  without acknowledging the dialog
@@ -104,13 +118,23 @@
     private static final String LINK_METHOD_SMART_LINKIFY_STRING = "smart_linkify";
 
     /**
+     * Use the machine learning based {@link TextClassifier} to generate links but hiding copy
+     * option. Will fallback to
+     * {@link #LINK_METHOD_LEGACY_LINKIFY} if not enabled.
+     */
+    private static final int LINK_METHOD_SMART_LINKIFY_NO_COPY = 3;
+
+    private static final String LINK_METHOD_SMART_LINKIFY_NO_COPY_STRING = "smart_linkify_no_copy";
+
+
+    /**
      * Text link method
      * @hide
      */
     @Retention(RetentionPolicy.SOURCE)
     @IntDef(prefix = "LINK_METHOD_",
             value = {LINK_METHOD_NONE, LINK_METHOD_LEGACY_LINKIFY,
-                    LINK_METHOD_SMART_LINKIFY})
+                    LINK_METHOD_SMART_LINKIFY, LINK_METHOD_SMART_LINKIFY_NO_COPY})
     private @interface LinkMethod {}
 
 
@@ -139,6 +163,18 @@
     // Show the opt-out dialog
     private AlertDialog mOptOutDialog;
 
+    /** BroadcastReceiver for screen off events. When screen was off, remove FLAG_TURN_SCREEN_ON to
+     * start from a clean state. Otherwise, the window flags from the first alert will be
+     * automatically applied to the following alerts handled at onNewIntent.
+     */
+    private BroadcastReceiver mScreenOffReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent){
+            Log.d(TAG, "onSreenOff: remove FLAG_TURN_SCREEN_ON flag");
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+    };
+
     /**
      * Animation handler for the flashing warning icon (emergency alerts only).
      */
@@ -178,9 +214,6 @@
         public void stopIconAnimation() {
             // Increment the counter so the handler will ignore the next message.
             mCount.incrementAndGet();
-            if (mWarningIconView != null) {
-                mWarningIconView.setVisibility(View.GONE);
-            }
         }
 
         /** Update the visibility of the warning icon. */
@@ -247,11 +280,24 @@
         ScreenOffHandler() {}
 
         /** Add screen on window flags and queue a delayed message to remove them later. */
-        void startScreenOnTimer() {
+        void startScreenOnTimer(@NonNull SmsCbMessage message) {
+            // if screenOnDuration in milliseconds. if set to 0, do not turn screen on.
+            int screenOnDuration = KEEP_SCREEN_ON_DURATION_MSEC;
+            CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
+                    getApplicationContext(), message.getSubscriptionId());
+            CellBroadcastChannelRange range = channelManager
+                    .getCellBroadcastChannelRangeFromMessage(message);
+            if (range!= null) {
+                screenOnDuration = range.mScreenOnDuration;
+            }
+            if (screenOnDuration == 0) {
+                Log.d(TAG, "screenOnDuration set to 0, do not turn screen on");
+                return;
+            }
             addWindowFlags();
             int msgWhat = mCount.incrementAndGet();
             removeMessages(msgWhat - 1);    // Remove previous message, if any.
-            sendEmptyMessageDelayed(msgWhat, KEEP_SCREEN_ON_DURATION_MSEC);
+            sendEmptyMessageDelayed(msgWhat, screenOnDuration);
             Log.d(TAG, "added FLAG_KEEP_SCREEN_ON, queued screen off message id " + msgWhat);
         }
 
@@ -267,10 +313,13 @@
                     | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         }
 
-        /** Clear the screen on window flags. */
+        /**
+         * Clear the keep screen on window flags in order for powersaving but keep TURN_ON_SCREEN_ON
+         * to make sure next wake up still turn screen on without unintended onStop triggered at
+         * the beginning.
+         */
         private void clearWindowFlags() {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-                    | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         }
 
         @Override
@@ -288,6 +337,11 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // if this is only to dismiss any pending alert dialog
+        if (getIntent().getBooleanExtra(CellBroadcastAlertService.DISMISS_DIALOG, false)) {
+            dismissAllFromNotification(getIntent());
+            return;
+        }
 
         final Window win = getWindow();
 
@@ -300,15 +354,12 @@
                 | 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);
         }
 
-        setFinishOnTouchOutside(false);
-
         // Initialize the view.
         LayoutInflater inflater = LayoutInflater.from(this);
         setContentView(inflater.inflate(R.layout.cell_broadcast_alert, null));
@@ -330,6 +381,8 @@
             clearNotification(intent);
         }
 
+        registerReceiver(mScreenOffReceiver, new IntentFilter(Intent.ACTION_SCREEN_OFF));
+
         if (mMessageList == null || mMessageList.size() == 0) {
             Log.e(TAG, "onCreate failed as message list is null or empty");
             finish();
@@ -350,9 +403,11 @@
             if (channelManager.isEmergencyMessage(message)) {
                 Log.d(TAG, "onCreate setting screen on timer for emergency alert for sub "
                         + message.getSubscriptionId());
-                mScreenOffHandler.startScreenOnTimer();
+                mScreenOffHandler.startScreenOnTimer(message);
             }
 
+            setFinishAlertOnTouchOutside();
+
             updateAlertText(message);
 
             Resources res = CellBroadcastSettings.getResources(getApplicationContext(),
@@ -382,12 +437,17 @@
     @VisibleForTesting
     public void onResume() {
         super.onResume();
+        setWindowBottom();
+        setMaxHeightScrollView();
         SmsCbMessage message = getLatestMessage();
         if (message != null) {
             int subId = message.getSubscriptionId();
             CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(this,
                     subId);
-            if (channelManager.isEmergencyMessage(message)) {
+            CellBroadcastChannelRange range = channelManager
+                    .getCellBroadcastChannelRangeFromMessage(message);
+            if (channelManager.isEmergencyMessage(message)
+                    && (range!= null && range.mDisplayIcon)) {
                 mAnimationHandler.startIconAnimation(subId);
             }
         }
@@ -407,16 +467,17 @@
     @Override
     protected void onStop() {
         Log.d(TAG, "onStop called");
-        // When the activity goes in background eg. clicking Home button, send notification.
+        // When the activity goes in background (eg. clicking Home button, dismissed by outside
+        // touch if enabled), send notification.
         // Avoid doing this when activity will be recreated because of orientation change or if
         // screen goes off
         PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
         if (!(isChangingConfigurations() || getLatestMessage() == null) && pm.isScreenOn()) {
             CellBroadcastAlertService.addToNotificationBar(getLatestMessage(), mMessageList,
-                    getApplicationContext(), true);
+                    getApplicationContext(), true, true, false);
         }
-        // Stop playing alert sound/vibration/speech (if started)
-        stopService(new Intent(this, CellBroadcastAlertAudio.class));
+        // Do not stop the audio here. Pressing power button should turn off screen but should not
+        // interrupt the audio/vibration
         super.onStop();
     }
 
@@ -436,6 +497,19 @@
         setPictogramAreaLayout(newConfig.orientation);
     }
 
+    private void setWindowBottom() {
+        // some OEMs require that the alert window is moved to the bottom of the screen to avoid
+        // blocking other screen content
+        if (getResources().getBoolean(R.bool.alert_dialog_bottom)) {
+            Window window = getWindow();
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+            params.gravity = params.gravity | Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
+            params.verticalMargin = 0;
+            window.setAttributes(params);
+        }
+    }
+
     /** Returns the currently displayed message. */
     SmsCbMessage getLatestMessage() {
         int index = mMessageList.size() - 1;
@@ -480,6 +554,7 @@
             case LINK_METHOD_NONE_STRING: return LINK_METHOD_NONE;
             case LINK_METHOD_LEGACY_LINKIFY_STRING: return LINK_METHOD_LEGACY_LINKIFY;
             case LINK_METHOD_SMART_LINKIFY_STRING: return LINK_METHOD_SMART_LINKIFY;
+            case LINK_METHOD_SMART_LINKIFY_NO_COPY_STRING: return LINK_METHOD_SMART_LINKIFY_NO_COPY;
         }
         return LINK_METHOD_NONE;
     }
@@ -493,12 +568,13 @@
      */
     private void addLinks(@NonNull TextView textView, @NonNull String messageText,
             @LinkMethod int linkMethod) {
-        Spannable text = new SpannableString(messageText);
         if (linkMethod == LINK_METHOD_LEGACY_LINKIFY) {
+            Spannable text = new SpannableString(messageText);
             Linkify.addLinks(text, Linkify.ALL);
             textView.setMovementMethod(LinkMovementMethod.getInstance());
             textView.setText(text);
-        } else if (linkMethod == LINK_METHOD_SMART_LINKIFY) {
+        } else if (linkMethod == LINK_METHOD_SMART_LINKIFY
+                || linkMethod == LINK_METHOD_SMART_LINKIFY_NO_COPY) {
             // Text classification cannot be run in the main thread.
             new Thread(() -> {
                 final TextClassifier classifier = textView.getTextClassifier();
@@ -516,13 +592,20 @@
                                         TextClassifier.TYPE_DATE_TIME))
                                 .build();
 
-                TextLinks.Request request = new TextLinks.Request.Builder(text)
+                TextLinks.Request request = new TextLinks.Request.Builder(messageText)
                         .setEntityConfig(entityConfig)
                         .build();
-                // Add links to the spannable text.
-                classifier.generateLinks(request).apply(
-                        text, TextLinks.APPLY_STRATEGY_REPLACE, null);
-
+                Spannable text;
+                if (linkMethod == LINK_METHOD_SMART_LINKIFY) {
+                    text = new SpannableString(messageText);
+                    // Add links to the spannable text.
+                    classifier.generateLinks(request).apply(
+                            text, TextLinks.APPLY_STRATEGY_REPLACE, null);
+                } else {
+                    TextLinks textLinks = classifier.generateLinks(request);
+                    // Add links to the spannable text.
+                    text = applyTextLinksToSpannable(messageText, textLinks, classifier);
+                }
                 // UI can be only updated in the main thread.
                 runOnUiThread(() -> {
                     textView.setMovementMethod(LinkMovementMethod.getInstance());
@@ -532,6 +615,65 @@
         }
     }
 
+    private Spannable applyTextLinksToSpannable(String text, TextLinks textLinks,
+            TextClassifier textClassifier) {
+        Spannable result = new SpannableString(text);
+        for (TextLink link : textLinks.getLinks()) {
+            TextClassification textClassification = textClassifier.classifyText(
+                    new Request.Builder(
+                            text,
+                            link.getStart(),
+                            link.getEnd())
+                            .build());
+            if (textClassification.getActions().isEmpty()) {
+                continue;
+            }
+            RemoteAction remoteAction = textClassification.getActions().get(0);
+            result.setSpan(new RemoteActionSpan(remoteAction), link.getStart(), link.getEnd(),
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        return result;
+    }
+
+    private static class RemoteActionSpan extends ClickableSpan {
+        private final RemoteAction mRemoteAction;
+        private RemoteActionSpan(RemoteAction remoteAction) {
+            mRemoteAction = remoteAction;
+        }
+        @Override
+        public void onClick(@NonNull View view) {
+            try {
+                mRemoteAction.getActionIntent().send();
+            } catch (PendingIntent.CanceledException e) {
+                Log.e(TAG, "Failed to start the pendingintent.");
+            }
+        }
+    }
+
+    /**
+     * If the carrier or country is configured to show the alert dialog title text in the
+     * language matching the message, this method returns the string in that language. Otherwise
+     * this method returns the string in the device's current language
+     *
+     * @param resId resource Id
+     * @param res Resources for the subId
+     * @param languageCode the ISO-639-1 language code for this message, or null if unspecified
+     */
+    private String overrideTranslation(int resId, Resources res, String languageCode,
+            boolean forceOverride) {
+        if (!TextUtils.isEmpty(languageCode)
+                && (res.getBoolean(R.bool.override_alert_title_language_to_match_message_locale)
+                || forceOverride)) {
+            Configuration conf = res.getConfiguration();
+            conf = new Configuration(conf);
+            conf.setLocale(new Locale(languageCode));
+            Context localizedContext = getApplicationContext().createConfigurationContext(conf);
+            return localizedContext.getResources().getText(resId).toString();
+        } else {
+            return res.getText(resId).toString();
+        }
+    }
+
     /**
      * Update alert text when a new emergency alert arrives.
      * @param message CB message which is used to update alert text.
@@ -540,25 +682,39 @@
         Context context = getApplicationContext();
         int titleId = CellBroadcastResources.getDialogTitleResource(context, message);
 
-        String title = getText(titleId).toString();
+        Resources res = CellBroadcastSettings.getResources(context, message.getSubscriptionId());
+
+        CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
+                this, message.getSubscriptionId());
+        CellBroadcastChannelRange range = channelManager
+                .getCellBroadcastChannelRangeFromMessage(message);
+        String languageCode;
+        boolean forceOverride = false;
+        if (range != null && !TextUtils.isEmpty(range.mLanguageCode)) {
+            languageCode = range.mLanguageCode;
+            forceOverride = true;
+        } else {
+            languageCode = message.getLanguageCode();
+        }
+        String title = overrideTranslation(titleId, res, languageCode, forceOverride);
         TextView titleTextView = findViewById(R.id.alertTitle);
 
-        Resources res = CellBroadcastSettings.getResources(context, message.getSubscriptionId());
         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);
-                title += "\n" + DateUtils.formatDateTime(context, message.getReceivedTime(),
-                        DateUtils.FORMAT_NO_NOON_MIDNIGHT | DateUtils.FORMAT_SHOW_TIME
-                                | DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE
-                                | DateUtils.FORMAT_CAP_AMPM);
+                title += "\n" + new SimpleDateFormat(timeFormat).format(message.getReceivedTime());
             }
-
             setTitle(title);
             titleTextView.setText(title);
         }
 
-        TextView textView = findViewById(R.id.message);
         String messageText = message.getMessageBody();
+        TextView textView = findViewById(R.id.message);
+        String messageBodyOverride = getMessageBodyOverride(context, message);
+        if (!TextUtils.isEmpty(messageBodyOverride)) {
+            messageText = messageBodyOverride;
+        }
         if (textView != null && messageText != null) {
             int linkMethod = getLinkMethod(message.getSubscriptionId());
             if (linkMethod != LINK_METHOD_NONE) {
@@ -582,6 +738,42 @@
     }
 
     /**
+     * @param message
+     * @return the required message override for the service category for the carrier, or null if
+     * it is not set
+     */
+    private String getMessageBodyOverride(Context context, SmsCbMessage message) {
+        // return true if the carrier has configured this service category to have a fixed message
+        Resources res = CellBroadcastSettings.getResources(context, message.getSubscriptionId());
+        String[] overrides = res.getStringArray(R.array.message_body_override);
+        if (overrides != null && overrides.length > 0) {
+            for (String entry : overrides) {
+                String[] serviceCategoryAndMessage = entry.split(":");
+                if (message.getServiceCategory() == Integer.parseInt(
+                        serviceCategoryAndMessage[0])) {
+                    return insertCarrierNameIfNeeded(context, message.getSubscriptionId(),
+                            serviceCategoryAndMessage[1]);
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * If an override message must have the carrier name (represented with a '>' character), return
+     * the message with the carrier name inserted. Otherwise just return the message.
+     */
+    private String insertCarrierNameIfNeeded(Context context, int subId, String message) {
+        TelephonyManager tm = context.getSystemService(TelephonyManager.class)
+                .createForSubscriptionId(subId);
+        String carrierName = (String) tm.getSimSpecificCarrierIdName();
+        if (TextUtils.isEmpty(carrierName)) {
+            return message;
+        }
+        return message.replace(">", carrierName);
+    }
+
+    /**
      * Set pictogram image
      * @param context
      * @param message
@@ -622,6 +814,18 @@
         }
     }
 
+    private void setMaxHeightScrollView() {
+        int contentPanelMaxHeight = getResources().getDimensionPixelSize(
+                R.dimen.alert_dialog_maxheight_content_panel);
+        if (contentPanelMaxHeight > 0) {
+            CustomHeightScrollView scrollView = (CustomHeightScrollView) findViewById(
+                    R.id.scrollView);
+            if (scrollView != null) {
+                scrollView.setMaximumHeight(contentPanelMaxHeight);
+            }
+        }
+    }
+
     /**
      * Called by {@link CellBroadcastAlertService} to add a new alert to the stack.
      * @param intent The new intent containing one or more {@link SmsCbMessage}.
@@ -629,15 +833,23 @@
     @Override
     @VisibleForTesting
     public void onNewIntent(Intent intent) {
+        if (intent.getBooleanExtra(CellBroadcastAlertService.DISMISS_DIALOG, false)) {
+            dismissAllFromNotification(intent);
+            return;
+        }
         ArrayList<SmsCbMessage> newMessageList = intent.getParcelableArrayListExtra(
                 CellBroadcastAlertService.SMS_CB_MESSAGE_EXTRA);
         if (newMessageList != null) {
             if (intent.getBooleanExtra(FROM_SAVE_STATE_NOTIFICATION_EXTRA, false)) {
                 mMessageList = newMessageList;
             } else {
+                // remove the duplicate messages
+                for (SmsCbMessage message : newMessageList) {
+                    mMessageList.removeIf(
+                            msg -> msg.getReceivedTime() == message.getReceivedTime());
+                }
                 mMessageList.addAll(newMessageList);
-                if (CellBroadcastSettings.getResources(getApplicationContext(),
-                        SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)
+                if (CellBroadcastSettings.getResourcesForDefaultSubId(getApplicationContext())
                         .getBoolean(R.bool.show_cmas_messages_in_priority_order)) {
                     // Sort message list to show messages in a different order than received by
                     // prioritizing them. Presidential Alert only has top priority.
@@ -666,7 +878,21 @@
                 }
             }
             Log.d(TAG, "onNewIntent called with message list of size " + newMessageList.size());
+
+            // For emergency alerts, keep screen on so the user can read it
+            SmsCbMessage message = getLatestMessage();
+            if (message != null) {
+                CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
+                        this, message.getSubscriptionId());
+                if (channelManager.isEmergencyMessage(message)) {
+                    Log.d(TAG, "onCreate setting screen on timer for emergency alert for sub "
+                            + message.getSubscriptionId());
+                    mScreenOffHandler.startScreenOnTimer(message);
+                }
+            }
+
             hideOptOutDialog(); // Hide opt-out dialog when new alert coming
+            setFinishAlertOnTouchOutside();
             updateAlertText(getLatestMessage());
             // If the new intent was sent from a notification, dismiss it.
             clearNotification(intent);
@@ -680,7 +906,7 @@
      * @param intent Intent containing extras used to identify if notification needs to be cleared
      */
     private void clearNotification(Intent intent) {
-        if (intent.getBooleanExtra(FROM_NOTIFICATION_EXTRA, false)) {
+        if (intent.getBooleanExtra(DISMISS_NOTIFICATION_EXTRA, false)) {
             NotificationManager notificationManager =
                     (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
             notificationManager.cancel(CellBroadcastAlertService.NOTIFICATION_ID);
@@ -689,6 +915,29 @@
     }
 
     /**
+     * This will be called when users swipe away the notification, this will
+     * 1. dismiss all foreground dialog, stop animating warning icon and stop the
+     * {@link CellBroadcastAlertAudio} service.
+     * 2. Does not mark message read.
+     */
+    public void dismissAllFromNotification(Intent intent) {
+        Log.d(TAG, "dismissAllFromNotification");
+        // Stop playing alert sound/vibration/speech (if started)
+        stopService(new Intent(this, CellBroadcastAlertAudio.class));
+        // Cancel any pending alert reminder
+        CellBroadcastAlertReminder.cancelAlertReminder();
+        // Remove the all current showing alert message from the list.
+        if (mMessageList != null) {
+            mMessageList.clear();
+        }
+        // clear notifications.
+        clearNotification(intent);
+        // Remove pending screen-off messages (animation messages are removed in onPause()).
+        mScreenOffHandler.stopScreenOnTimer();
+        finish();
+    }
+
+    /**
      * Stop animating warning icon and stop the {@link CellBroadcastAlertAudio}
      * service if necessary.
      */
@@ -709,6 +958,10 @@
             return;
         }
 
+        // Remove the read message from the notification bar.
+        // e.g, read the message from emergency alert history, need to update the notification bar.
+        removeReadMessageFromNotificationBar(lastMessage, getApplicationContext());
+
         // Mark the alert as read.
         final long deliveryTime = lastMessage.getReceivedTime();
 
@@ -718,20 +971,27 @@
                         -> provider.markBroadcastRead(Telephony.CellBroadcasts.DELIVERY_TIME,
                         deliveryTime));
 
-        // Set the opt-out dialog flag if this is a CMAS alert (other than Presidential Alert).
-        if (lastMessage.isCmasMessage() && lastMessage.getCmasWarningInfo().getMessageClass()
-                != SmsCbCmasInfo.CMAS_CLASS_PRESIDENTIAL_LEVEL_ALERT) {
+        // Set the opt-out dialog flag if this is a CMAS alert (other than Always-on alert e.g,
+        // Presidential alert).
+        CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
+                getApplicationContext(),
+                lastMessage.getSubscriptionId());
+        CellBroadcastChannelRange range = channelManager
+                .getCellBroadcastChannelRangeFromMessage(lastMessage);
+
+        if (!neverShowOptOutDialog(lastMessage.getSubscriptionId()) && range != null
+                && !range.mAlwaysOn) {
             mShowOptOutDialog = true;
         }
 
         // If there are older emergency alerts to display, update the alert text and return.
         SmsCbMessage nextMessage = getLatestMessage();
         if (nextMessage != null) {
+            setFinishAlertOnTouchOutside();
             updateAlertText(nextMessage);
             int subId = nextMessage.getSubscriptionId();
-            CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
-                    getApplicationContext(), subId);
-            if (channelManager.isEmergencyMessage(nextMessage)) {
+            if (channelManager.isEmergencyMessage(nextMessage)
+                    && (range!= null && range.mDisplayIcon)) {
                 mAnimationHandler.startIconAnimation(subId);
             } else {
                 mAnimationHandler.stopIconAnimation();
@@ -762,18 +1022,25 @@
                 }
             }
         }
-        NotificationManager notificationManager =
-                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.cancel(CellBroadcastAlertService.NOTIFICATION_ID);
         finish();
     }
 
     @Override
+    public void onDestroy() {
+        try {
+            unregisterReceiver(mScreenOffReceiver);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "Unregister Receiver fail", e);
+        }
+        super.onDestroy();
+    }
+
+    @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         Log.d(TAG, "onKeyDown: " + event);
         SmsCbMessage message = getLatestMessage();
-        if (CellBroadcastSettings.getResources(getApplicationContext(), message.getSubscriptionId())
-                .getBoolean(R.bool.mute_by_physical_button)) {
+        if (message != null && CellBroadcastSettings.getResources(getApplicationContext(),
+                message.getSubscriptionId()).getBoolean(R.bool.mute_by_physical_button)) {
             switch (event.getKeyCode()) {
                 // Volume keys and camera keys mute the alert sound/vibration (except ETWS).
                 case KeyEvent.KEYCODE_VOLUME_UP:
@@ -818,6 +1085,14 @@
     }
 
     /**
+     * @return true if the device is configured to never show the opt out dialog for the mcc/mnc
+     */
+    private boolean neverShowOptOutDialog(int subId) {
+        return CellBroadcastSettings.getResources(getApplicationContext(), subId)
+                .getBoolean(R.bool.disable_opt_out_dialog);
+    }
+
+    /**
      * Copy the message to clipboard.
      *
      * @param message Cell broadcast message.
@@ -836,4 +1111,51 @@
         Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
         return true;
     }
+
+    /**
+     * Remove read message from the notification bar, update the notification text, count or cancel
+     * the notification if there is no un-read messages.
+     * @param message The dismissed/read message to be removed from the notification bar
+     * @param context
+     */
+    private void removeReadMessageFromNotificationBar(SmsCbMessage message, Context context) {
+        Log.d(TAG, "removeReadMessageFromNotificationBar, msg: " + message.toString());
+        ArrayList<SmsCbMessage> unreadMessageList = CellBroadcastReceiverApp
+                .removeReadMessage(message);
+        if (unreadMessageList.isEmpty()) {
+            Log.d(TAG, "removeReadMessageFromNotificationBar, cancel notification");
+            NotificationManager notificationManager = getSystemService(NotificationManager.class);
+            notificationManager.cancel(CellBroadcastAlertService.NOTIFICATION_ID);
+        } else {
+            Log.d(TAG, "removeReadMessageFromNotificationBar, update count to "
+                    + unreadMessageList.size() );
+            // do not alert if remove unread messages from the notification bar.
+           CellBroadcastAlertService.addToNotificationBar(
+                   CellBroadcastReceiverApp.getLatestMessage(),
+                   unreadMessageList, context,false, false, false);
+        }
+    }
+
+    /**
+     * Finish alert dialog only if all messages are configured with DismissOnOutsideTouch.
+     * When multiple messages are displayed, the message with dismissOnOutsideTouch(normally low
+     * priority message) is displayed on top of other unread alerts without dismissOnOutsideTouch,
+     * users can easily dismiss all messages by touching the screen. better way is to dismiss the
+     * alert if and only if all messages with dismiss_on_outside_touch set true.
+     */
+    private void setFinishAlertOnTouchOutside() {
+        if (mMessageList != null) {
+            int dismissCount = 0;
+            for (SmsCbMessage message : mMessageList) {
+                CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
+                        this, message.getSubscriptionId());
+                CellBroadcastChannelManager.CellBroadcastChannelRange range =
+                        channelManager.getCellBroadcastChannelRangeFromMessage(message);
+                if (range != null && range.mDismissOnOutsideTouch) {
+                    dismissCount++;
+                }
+            }
+            setFinishOnTouchOutside(mMessageList.size() > 0 && mMessageList.size() == dismissCount);
+        }
+    }
 }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
index 2f58edc..0da6898 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
@@ -180,7 +180,7 @@
                 prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_ALERT_VIBRATE, true));
         playIntent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, subId);
         sPlayReminderIntent = PendingIntent.getService(context, 0, playIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
 
         AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
         if (alarmManager == null) {
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index ee92eee..609cbee 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -26,14 +26,14 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.media.AudioAttributes;
-import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
@@ -48,7 +48,6 @@
 import android.telephony.PhoneStateListener;
 import android.telephony.SmsCbEtwsInfo;
 import android.telephony.SmsCbMessage;
-import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -59,6 +58,7 @@
 
 import java.util.ArrayList;
 import java.util.Locale;
+import java.util.Set;
 
 /**
  * This service manages the display and animation of broadcast messages.
@@ -66,8 +66,7 @@
  * and an alert tone is played when the alert is first shown to the user
  * (but not when the user views a previously received broadcast).
  */
-public class CellBroadcastAlertService extends Service
-        implements AudioManager.OnAudioFocusChangeListener {
+public class CellBroadcastAlertService extends Service {
     private static final String TAG = "CBAlertService";
 
     /** Intent action to display alert dialog/notification, after verifying the alert is new. */
@@ -78,9 +77,20 @@
     public static final String SMS_CB_MESSAGE_EXTRA =
             "com.android.cellbroadcastreceiver.SMS_CB_MESSAGE";
 
+    /** Intent extra indicate this intent is to dismiss the alert dialog */
+    public static final String DISMISS_DIALOG = "com.android.cellbroadcastreceiver.DIMISS_DIALOG";
+
+    /**
+     * Use different request code to create distinct pendingIntent for notification deleteIntent
+     * and contentIntent.
+     */
+    private static final int REQUEST_CODE_CONTENT_INTENT = 1;
+    private static final int REQUEST_CODE_DELETE_INTENT = 2;
+
     /** Use the same notification ID for non-emergency alerts. */
     @VisibleForTesting
     public static final int NOTIFICATION_ID = 1;
+    public static final int SETTINGS_CHANGED_NOTIFICATION_ID = 2;
 
     /**
      * Notification channel containing for non-emergency alerts.
@@ -88,13 +98,22 @@
     static final String NOTIFICATION_CHANNEL_NON_EMERGENCY_ALERTS = "broadcastMessagesNonEmergency";
 
     /**
-     * Notification channel for emergency alerts. This is used when users sneak out of the
-     * noisy pop-up for a real emergency and get a notification due to not officially acknowledged
-     * the alert and want to refer it back later.
+     * Notification channel for notifications accompanied by the alert dialog.
+     * e.g, only show when the device has active connections to companion devices.
      */
     static final String NOTIFICATION_CHANNEL_EMERGENCY_ALERTS = "broadcastMessages";
 
     /**
+     * Notification channel for emergency alerts. This is used when users dismiss the alert
+     * dialog without officially hitting "OK" (e.g. by pressing the home button). In this case we
+     * pop up a notification for them to refer to later.
+     *
+     * This notification channel is HIGH_PRIORITY.
+     */
+    static final String NOTIFICATION_CHANNEL_HIGH_PRIORITY_EMERGENCY_ALERTS =
+            "broadcastMessagesHighPriority";
+
+    /**
      * Notification channel for emergency alerts during voice call. This is used when users in a
      * voice call, emergency alert will be displayed in a notification format rather than playing
      * alert tone.
@@ -102,6 +121,12 @@
     static final String NOTIFICATION_CHANNEL_EMERGENCY_ALERTS_IN_VOICECALL =
         "broadcastMessagesInVoiceCall";
 
+    /**
+     * Notification channel for informing the user when a new Carrier's WEA settings have been
+     * automatically applied.
+     */
+    static final String NOTIFICATION_CHANNEL_SETTINGS_UPDATES = "settingsUpdates";
+
     /** Intent extra for passing a SmsCbMessage */
     private static final String EXTRA_MESSAGE = "message";
 
@@ -128,7 +153,6 @@
     }
 
     private TelephonyManager mTelephonyManager;
-    private AudioManager mAudioManager;
 
     /**
      * Do not preempt active voice call, instead post notifications and play the ringtone/vibrate
@@ -163,8 +187,6 @@
         mTelephonyManager = (TelephonyManager)
                 getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
         mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
-        mAudioManager = (AudioManager)
-            getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
     }
 
     @Override
@@ -175,12 +197,33 @@
     }
 
     /**
+     * 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());
+        // 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.
      */
-    private boolean shouldDisplayMessage(SmsCbMessage message) {
+    @VisibleForTesting
+    public boolean shouldDisplayMessage(SmsCbMessage message) {
         TelephonyManager tm = ((TelephonyManager) mContext.getSystemService(
                 Context.TELEPHONY_SERVICE)).createForSubscriptionId(message.getSubscriptionId());
         if (tm.getEmergencyCallbackMode() && CellBroadcastSettings.getResources(
@@ -212,8 +255,8 @@
         String messageLanguage = message.getLanguageCode();
         if (range != null && range.mFilterLanguage) {
             // language filtering based on CBR second language settings
-            final String secondLanguageCode =  CellBroadcastSettings.getResources(mContext,
-                    SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)
+            final String secondLanguageCode = CellBroadcastSettings.getResources(mContext,
+                    message.getSubscriptionId())
                     .getString(R.string.emergency_alert_second_language_code);
             if (!secondLanguageCode.isEmpty()) {
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
@@ -245,6 +288,13 @@
             }
         }
 
+        // If the alert is set for test-mode only, then we should check if device is currently under
+        // testing mode (testing mode can be enabled by dialer code *#*#CMAS#*#*.
+        if (range != null && range.mTestMode && !CellBroadcastReceiver.isTestingMode(mContext)) {
+            Log.d(TAG, "ignoring the alert due to not in testing mode");
+            return false;
+        }
+
         // Check for custom filtering
         String messageFilters = SystemProperties.get(MESSAGE_FILTER_PROPERTY_KEY, "");
         if (!TextUtils.isEmpty(messageFilters)) {
@@ -297,29 +347,36 @@
         // write to database on a background thread
         new CellBroadcastContentProvider.AsyncCellBroadcastTask(getContentResolver())
                 .execute((CellBroadcastContentProvider.CellBroadcastOperation) provider -> {
-                    if (provider.insertNewBroadcast(message)) {
-                        // new message, show the alert or notification on UI thread
-                        startService(alertIntent);
-                        // mark the message as displayed to the user.
-                        markMessageDisplayed(message);
-                        if (CellBroadcastSettings.getResources(mContext,
-                                message.getSubscriptionId())
-                                .getBoolean(R.bool.enable_write_alerts_to_sms_inbox)) {
-                            // TODO: Should not create the instance of channel manager everywhere.
-                            CellBroadcastChannelManager channelManager =
-                                    new CellBroadcastChannelManager(mContext,
-                                            message.getSubscriptionId());
-                            CellBroadcastChannelRange range = channelManager
-                                    .getCellBroadcastChannelRangeFromMessage(message);
-                            if (CellBroadcastReceiver.isTestingMode(getApplicationContext())
-                                    || (range != null && range.mWriteToSmsInbox)) {
-                                writeMessageToSmsInbox(message);
-                            }
+                    CellBroadcastChannelManager channelManager =
+                            new CellBroadcastChannelManager(mContext, message.getSubscriptionId());
+                    CellBroadcastChannelRange range = channelManager
+                            .getCellBroadcastChannelRangeFromMessage(message);
+                    // Check if the message was marked as do not display. Some channels
+                    // are reserved for biz purpose where the msg should be routed as a data SMS
+                    // rather than being displayed as pop-up or notification. However,
+                    // per requirements those messages might also need to write to sms inbox...
+                    boolean ret = false;
+                    if (range != null && range.mDisplay == true) {
+                        if (provider.insertNewBroadcast(message)) {
+                            // new message, show the alert or notification on UI thread
+                            // if not display..
+                            startService(alertIntent);
+                            // mark the message as displayed to the user.
+                            markMessageDisplayed(message);
+                            ret = true;
                         }
-                        return true;
                     } else {
-                        return false;
+                        Log.d(TAG, "ignoring the alert due to configured channels was marked "
+                                + "as do not display");
                     }
+                    if (CellBroadcastSettings.getResources(mContext, message.getSubscriptionId())
+                            .getBoolean(R.bool.enable_write_alerts_to_sms_inbox)) {
+                        if (CellBroadcastReceiver.isTestingMode(getApplicationContext())
+                                || (range != null && range.mWriteToSmsInbox)) {
+                            provider.writeMessageToSmsInbox(message, mContext);
+                        }
+                    }
+                    return ret;
                 });
     }
 
@@ -329,9 +386,9 @@
      * @param message The cell broadcast message.
      */
     private void markMessageDisplayed(SmsCbMessage message) {
-        ContentValues cv = new ContentValues();
-        cv.put(Telephony.CellBroadcasts.MESSAGE_DISPLAYED, 1);
-        mContext.getContentResolver().update(Telephony.CellBroadcasts.CONTENT_URI, cv,
+        mContext.getContentResolver().update(
+                Uri.withAppendedPath(Telephony.CellBroadcasts.CONTENT_URI,"displayed"),
+                new ContentValues(),
                 Telephony.CellBroadcasts.RECEIVED_TIME + "=?",
                 new String[] {Long.toString(message.getReceivedTime())});
     }
@@ -363,12 +420,25 @@
         if (channelManager.isEmergencyMessage(cbm) && !sRemindAfterCallFinish) {
             // start alert sound / vibration / TTS and display full-screen alert
             openEmergencyAlertNotification(cbm);
+            Resources res = CellBroadcastSettings.getResources(mContext, cbm.getSubscriptionId());
+            // KR carriers mandate to always show notifications along with alert dialog.
+            if (res.getBoolean(R.bool.show_alert_dialog_with_notification) ||
+                    // to support emergency alert on companion devices use flag
+                    // show_notification_if_connected_to_companion_devices instead.
+                    (res.getBoolean(R.bool.show_notification_if_connected_to_companion_devices)
+                            && isConnectedToCompanionDevices())) {
+                // add notification to the bar by passing the list of unread non-emergency
+                // cell broadcast messages. The notification should be of LOW_IMPORTANCE if the
+                // notification is shown together with full-screen dialog.
+                addToNotificationBar(cbm, CellBroadcastReceiverApp.addNewMessageToList(cbm),
+                        this, false, true, shouldDisplayFullScreenMessage(cbm));
+            }
         } else {
             // add notification to the bar by passing the list of unread non-emergency
             // cell broadcast messages
             ArrayList<SmsCbMessage> messageList = CellBroadcastReceiverApp
                     .addNewMessageToList(cbm);
-            addToNotificationBar(cbm, messageList, this, false);
+            addToNotificationBar(cbm, messageList, this, false, true, false);
         }
     }
 
@@ -379,35 +449,43 @@
      * @return true if the channel is enabled on the device, otherwise false.
      */
     private boolean isChannelEnabled(SmsCbMessage message) {
+        CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(mContext,
+                message.getSubscriptionId());
+        CellBroadcastChannelRange chanelrange = channelManager
+                .getCellBroadcastChannelRangeFromMessage(message);
+        Resources res = CellBroadcastSettings.getResources(mContext, message.getSubscriptionId());
+        if (chanelrange != null && chanelrange.mAlwaysOn) {
+            Log.d(TAG, "channel is enabled due to always-on, ignoring preference check");
+            return true;
+        }
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         // Check if all emergency alerts are disabled.
         boolean emergencyAlertEnabled =
                 prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE, true);
+        int channel = message.getServiceCategory();
 
         SmsCbEtwsInfo etwsInfo = message.getEtwsWarningInfo();
-        if (etwsInfo != null
-                && etwsInfo.getWarningType() == SmsCbEtwsInfo.ETWS_WARNING_TYPE_TEST_MESSAGE) {
+        if ((etwsInfo != null && etwsInfo.getWarningType()
+                == SmsCbEtwsInfo.ETWS_WARNING_TYPE_TEST_MESSAGE)
+                || channelManager.checkCellBroadcastChannelRange(channel,
+                R.array.etws_test_alerts_range_strings)) {
             return emergencyAlertEnabled
                     && CellBroadcastSettings.isTestAlertsToggleVisible(getApplicationContext())
                     && PreferenceManager.getDefaultSharedPreferences(this)
                     .getBoolean(CellBroadcastSettings.KEY_ENABLE_TEST_ALERTS, false);
         }
 
-        if (message.isEtwsMessage()) {
+        if (message.isEtwsMessage() || channelManager.checkCellBroadcastChannelRange(channel,
+                R.array.etws_alerts_range_strings)) {
             // ETWS messages.
             // Turn on/off emergency notifications is the only way to turn on/off ETWS messages.
             return emergencyAlertEnabled;
-
         }
 
-        int channel = message.getServiceCategory();
-
         // Check if the messages are on additional channels enabled by the resource config.
         // If those channels are enabled by the carrier, but the device is actually roaming, we
         // should not allow the messages.
-        CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
-                mContext, message.getSubscriptionId());
         ArrayList<CellBroadcastChannelRange> ranges = channelManager.getCellBroadcastChannelRanges(
                 R.array.additional_cbs_channels_strings);
 
@@ -428,6 +506,12 @@
                             .getBoolean(CellBroadcastSettings.KEY_ENABLE_TEST_ALERTS,
                                     false);
                 }
+                if (range.mAlertType == AlertType.AREA) {
+                    return emergencyAlertEnabled && PreferenceManager
+                            .getDefaultSharedPreferences(this)
+                            .getBoolean(CellBroadcastSettings.KEY_ENABLE_AREA_UPDATE_INFO_ALERTS,
+                                    false);
+                }
 
                 return emergencyAlertEnabled;
             }
@@ -464,10 +548,18 @@
                             .getBoolean(CellBroadcastSettings.KEY_ENABLE_CMAS_AMBER_ALERTS, true);
         }
 
-        if (channelManager.checkCellBroadcastChannelRange(channel,
-                R.array.exercise_alert_range_strings)
-                && getResources().getBoolean(R.bool.always_enable_exercise_alert)) {
-            return true;
+        if (channelManager.checkCellBroadcastChannelRange(
+                channel, R.array.exercise_alert_range_strings) &&
+                res.getBoolean(R.bool.show_separate_exercise_settings)) {
+            return emergencyAlertEnabled && PreferenceManager.getDefaultSharedPreferences(this)
+                    .getBoolean(CellBroadcastSettings.KEY_ENABLE_EXERCISE_ALERTS, false);
+        }
+
+        if (channelManager.checkCellBroadcastChannelRange(
+                channel, R.array.operator_defined_alert_range_strings) &&
+                res.getBoolean(R.bool.show_separate_operator_defined_settings)) {
+            return emergencyAlertEnabled && PreferenceManager.getDefaultSharedPreferences(this)
+                    .getBoolean(CellBroadcastSettings.KEY_OPERATOR_DEFINED_ALERTS, false);
         }
 
         if (channelManager.checkCellBroadcastChannelRange(channel,
@@ -499,7 +591,8 @@
                             false);
         }
 
-        return true;
+        Log.e(TAG, "received undefined channels: " + channel);
+        return false;
     }
 
     /**
@@ -507,6 +600,11 @@
      * @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);
@@ -562,21 +660,29 @@
                         ? range.mVibrationPattern
                         : CellBroadcastSettings.getResources(mContext, message.getSubscriptionId())
                         .getIntArray(R.array.default_vibration_pattern));
-
-        if (prefs.getBoolean(CellBroadcastSettings.KEY_OVERRIDE_DND, false)
-                || (range != null && range.mOverrideDnd)) {
+        // read key_override_dnd only when the toggle is visible.
+        // range.mOverrideDnd is per channel configuration. override_dnd is the main config
+        // applied for all channels.
+        Resources res = CellBroadcastSettings.getResources(mContext, message.getSubscriptionId());
+        if ((res.getBoolean(R.bool.show_override_dnd_settings)
+                && prefs.getBoolean(CellBroadcastSettings.KEY_OVERRIDE_DND, false))
+                || (range != null && range.mOverrideDnd) || res.getBoolean(R.bool.override_dnd)) {
             audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_OVERRIDE_DND_EXTRA, true);
         }
 
         String messageBody = message.getMessageBody();
 
-        audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_MESSAGE_BODY, messageBody);
+        if (!CellBroadcastSettings.getResourcesForDefaultSubId(mContext)
+                .getBoolean(R.bool.show_alert_speech_setting)
+                || prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_ALERT_SPEECH, true)) {
+            audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_MESSAGE_BODY, messageBody);
 
-        String language = message.getLanguageCode();
+            String language = message.getLanguageCode();
 
-        Log.d(TAG, "Message language = " + language);
-        audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_MESSAGE_LANGUAGE,
-                language);
+            Log.d(TAG, "Message language = " + language);
+            audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_MESSAGE_LANGUAGE,
+                    language);
+        }
 
         audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_SUB_INDEX,
                 message.getSubscriptionId());
@@ -589,7 +695,7 @@
 
         // For FEATURE_WATCH, the dialog doesn't make sense from a UI/UX perspective
         if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
-            addToNotificationBar(message, messageList, this, false);
+            addToNotificationBar(message, messageList, this, false, true, false);
         } else {
             Intent alertDialogIntent = createDisplayMessageIntent(this,
                     CellBroadcastAlertDialog.class, messageList);
@@ -600,13 +706,20 @@
     }
 
     /**
-     * Add the new alert to the notification bar (non-emergency alerts), or launch a
-     * high-priority immediate intent for emergency alerts.
+     * Add the new alert to the notification bar (non-emergency alerts), launch a
+     * high-priority immediate intent for emergency alerts or notifications for companion devices.
      * @param message the alert to display
+     * @param shouldAlert only notify once if set to {@code false}.
+     * @param fromDialog if {@code true} indicate this notification is coming from the alert dialog
+     * with following behaviors:
+     * 1. display when alert is shown in the foreground.
+     * 2. dismiss when foreground alert is gone.
+     * 3. dismiss foreground alert when swipe away the notification.
+     * 4. no dialog open when tap the notification.
      */
     static void addToNotificationBar(SmsCbMessage message,
-                                     ArrayList<SmsCbMessage> messageList, Context context,
-                                     boolean fromSaveState) {
+            ArrayList<SmsCbMessage> messageList, Context context,
+            boolean fromSaveState, boolean shouldAlert, boolean fromDialog) {
         Resources res = CellBroadcastSettings.getResources(context, message.getSubscriptionId());
         int channelTitleId = CellBroadcastResources.getDialogTitleResource(context, message);
         CharSequence channelName = context.getText(channelTitleId);
@@ -628,23 +741,33 @@
                     messageList);
         }
 
-        intent.putExtra(CellBroadcastAlertDialog.FROM_NOTIFICATION_EXTRA, true);
+        // if this is an notification from on-going alert alert, do not clear the notification when
+        // tap the notification. the notification should be gone either when users swipe away or
+        // when the foreground dialog dismissed.
+        intent.putExtra(CellBroadcastAlertDialog.DISMISS_NOTIFICATION_EXTRA, !fromDialog);
         intent.putExtra(CellBroadcastAlertDialog.FROM_SAVE_STATE_NOTIFICATION_EXTRA, fromSaveState);
 
         PendingIntent pi;
         if (isWatch) {
             pi = PendingIntent.getBroadcast(context, 0, intent, 0);
         } else {
-            pi = PendingIntent.getActivity(context, NOTIFICATION_ID, intent,
-                    PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
+            pi = PendingIntent.getActivity(context, REQUEST_CODE_CONTENT_INTENT, intent,
+                    PendingIntent.FLAG_ONE_SHOT
+                            | PendingIntent.FLAG_UPDATE_CURRENT
+                            | PendingIntent.FLAG_IMMUTABLE);
         }
         CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
                 context, message.getSubscriptionId());
 
-        String channelId = channelManager.isEmergencyMessage(message)
-                ? NOTIFICATION_CHANNEL_EMERGENCY_ALERTS : NOTIFICATION_CHANNEL_NON_EMERGENCY_ALERTS;
-        if (channelId == NOTIFICATION_CHANNEL_EMERGENCY_ALERTS && sRemindAfterCallFinish) {
+        String channelId;
+        if (!channelManager.isEmergencyMessage(message)) {
+            channelId = NOTIFICATION_CHANNEL_NON_EMERGENCY_ALERTS;
+        } else if (sRemindAfterCallFinish) {
             channelId = NOTIFICATION_CHANNEL_EMERGENCY_ALERTS_IN_VOICECALL;
+        } else if (fromDialog) {
+            channelId = NOTIFICATION_CHANNEL_EMERGENCY_ALERTS;
+        } else {
+            channelId = NOTIFICATION_CHANNEL_HIGH_PRIORITY_EMERGENCY_ALERTS;
         }
 
         boolean nonSwipeableNotification = message.isEmergencyMessage()
@@ -661,13 +784,28 @@
                         .setPriority(Notification.PRIORITY_HIGH)
                         .setColor(res.getColor(R.color.notification_color))
                         .setVisibility(Notification.VISIBILITY_PUBLIC)
-                        .setOngoing(nonSwipeableNotification);
+                        .setOngoing(nonSwipeableNotification)
+                        .setOnlyAlertOnce(!shouldAlert);
 
         if (isWatch) {
             builder.setDeleteIntent(pi);
             // FEATURE_WATCH/CWH devices see this as priority
             builder.setVibrate(new long[]{0});
         } else {
+            // If this is a notification coming from the foreground dialog, should dismiss the
+            // foreground alert dialog when swipe the notification. This is needed
+            // when receiving emergency alerts on companion devices are supported, so that users
+            // swipe away notification on companion devices will synced to the parent devices
+            // with the foreground dialog/sound/vibration dismissed and stopped. Delete intent is
+            // also needed for regular notifications (e.g, pressing home button) to stop the
+            // sound, vibration and alert reminder.
+            Intent deleteIntent = new Intent(intent);
+            deleteIntent.putExtra(CellBroadcastAlertService.DISMISS_DIALOG, true);
+            builder.setDeleteIntent(PendingIntent.getActivity(context, REQUEST_CODE_DELETE_INTENT,
+                    deleteIntent, PendingIntent.FLAG_ONE_SHOT
+                            | PendingIntent.FLAG_UPDATE_CURRENT
+                            | PendingIntent.FLAG_IMMUTABLE));
+
             builder.setContentIntent(pi);
             // This will break vibration on FEATURE_WATCH, so use it for anything else
             builder.setDefaults(Notification.DEFAULT_ALL);
@@ -715,6 +853,12 @@
                 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.createNotificationChannel(
                 new NotificationChannel(
+                        NOTIFICATION_CHANNEL_HIGH_PRIORITY_EMERGENCY_ALERTS,
+                        context.getString(
+                                R.string.notification_channel_emergency_alerts_high_priority),
+                        NotificationManager.IMPORTANCE_HIGH));
+        notificationManager.createNotificationChannel(
+                new NotificationChannel(
                         NOTIFICATION_CHANNEL_EMERGENCY_ALERTS,
                         context.getString(R.string.notification_channel_emergency_alerts),
                         NotificationManager.IMPORTANCE_LOW));
@@ -731,14 +875,22 @@
             NotificationManager.IMPORTANCE_HIGH);
         emergencyAlertInVoiceCall.enableVibration(true);
         notificationManager.createNotificationChannel(emergencyAlertInVoiceCall);
+
+        final NotificationChannel settingsUpdate = new NotificationChannel(
+                NOTIFICATION_CHANNEL_SETTINGS_UPDATES,
+                context.getString(R.string.notification_channel_settings_updates),
+                NotificationManager.IMPORTANCE_DEFAULT);
+        notificationManager.createNotificationChannel(settingsUpdate);
     }
 
+
     private static Intent createDisplayMessageIntent(Context context, Class intentClass,
             ArrayList<SmsCbMessage> messageList) {
         // Trigger the list activity to fire up a dialog that shows the received messages
         Intent intent = new Intent(context, intentClass);
         intent.putParcelableArrayListExtra(CellBroadcastAlertService.SMS_CB_MESSAGE_EXTRA,
                 messageList);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION);
         return intent;
     }
 
@@ -770,15 +922,6 @@
         }
     }
 
-    @Override
-    public void onAudioFocusChange(int focusChange) {
-        if(focusChange == AudioManager.AUDIOFOCUS_GAIN) {
-            Log.d(TAG, "audio focus released from voice call, play pending alert if needed");
-            mAudioManager.abandonAudioFocus(this);
-            playPendingAlert();
-        }
-    }
-
     /**
      * Remove previous unread notifications and play stored unread
      * emergency messages after voice call finish.
@@ -791,28 +934,7 @@
             switch (state) {
                 case TelephonyManager.CALL_STATE_IDLE:
                     Log.d(TAG, "onCallStateChanged: CALL_STATE_IDLE");
-                    // check if audio focus was released by voice call. This is to avoid possible
-                    // race conditions that voice call did not release audio focus while alert is
-                    // playing at the same time (out-of-rhythm)
-                    if (mAudioManager == null) {
-                        mAudioManager = (AudioManager)
-                            getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
-                    }
-                    int audioFocusResult = mAudioManager.requestAudioFocus(
-                            CellBroadcastAlertService.this::onAudioFocusChange,
-                            new AudioAttributes.Builder().setLegacyStreamType(
-                                    AudioManager.STREAM_ALARM).build(),
-                            AudioManager.AUDIOFOCUS_GAIN_TRANSIENT,
-                            AudioManager.AUDIOFOCUS_FLAG_DELAY_OK);
-                    if (audioFocusResult == AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
-                        Log.d(TAG, "audio focus released from voice call, "
-                                + "play pending alert if needed");
-                        mAudioManager.abandonAudioFocus(
-                                CellBroadcastAlertService.this::onAudioFocusChange);
-                        playPendingAlert();
-                    } else {
-                        Log.d(TAG, "wait for audio focus release after call");
-                    }
+                    playPendingAlert();
                     break;
 
                 default:
@@ -845,28 +967,25 @@
         }
     }
 
-    /**
-     * Write displayed cellbroadcast messages to sms inbox
-     *
-     * @param message The cell broadcast message.
-     */
-    private void writeMessageToSmsInbox(@NonNull SmsCbMessage message) {
-        // composing SMS
-        ContentValues cv = new ContentValues();
-        cv.put(Telephony.Sms.Inbox.BODY, message.getMessageBody());
-        cv.put(Telephony.Sms.Inbox.DATE, message.getReceivedTime());
-        cv.put(Telephony.Sms.Inbox.SUBSCRIPTION_ID, message.getSubscriptionId());
-        cv.put(Telephony.Sms.Inbox.SUBJECT, CellBroadcastResources.getDialogTitleResource(mContext,
-                message));
-        cv.put(Telephony.Sms.Inbox.ADDRESS, mContext.getString(R.string.sms_cb_sender_name));
-        // store all cellbroadcast messages in the same thread.
-        cv.put(Telephony.Sms.Inbox.THREAD_ID, Telephony.Threads.getOrCreateThreadId(mContext,
-                mContext.getString(R.string.sms_cb_sender_name)));
-        Uri uri = mContext.getContentResolver().insert(Telephony.Sms.Inbox.CONTENT_URI, cv);
-        if (uri == null) {
-            Log.e(TAG, "writeMessageToSmsInbox: failed");
-        } else {
-            Log.d(TAG, "writeMessageToSmsInbox: succeed uri = " + uri);
+    private boolean isConnectedToCompanionDevices() {
+        BluetoothManager bluetoothMgr = getSystemService(BluetoothManager.class);
+        Set<BluetoothDevice> devices;
+        try {
+            devices = bluetoothMgr.getAdapter().getBondedDevices();
+        } catch (SecurityException ex) {
+            // running on S+ will need runtime permission grant
+            // always return true here assuming there is connected devices to show alert in case
+            // of permission denial.
+            return true;
         }
+
+        // TODO: filter out specific device types like wearable. no API support now.
+        for (BluetoothDevice device : devices) {
+            if (device.isConnected()) {
+                Log.d(TAG, "connected to device: " + device.getName());
+                return true;
+            }
+        }
+        return false;
     }
 }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastBackupAgent.java b/src/com/android/cellbroadcastreceiver/CellBroadcastBackupAgent.java
index 2c5d977..620276c 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastBackupAgent.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastBackupAgent.java
@@ -22,6 +22,8 @@
 import android.os.UserHandle;
 import android.util.Log;
 
+import com.android.internal.annotations.VisibleForTesting;
+
 /**
  * The CellBroadcast backup agent backs up the shared
  * preferences settings of the CellBroadcastReceiver App. Right
@@ -32,7 +34,8 @@
 {
     private static final String TAG = "CBBackupAgent";
 
-    private static final String SHARED_KEY = "shared_pref";
+    @VisibleForTesting
+    public static final String SHARED_KEY = "shared_pref";
 
     private static final String SHARED_PREFS_NAME = "com.android.cellbroadcastreceiver_preferences";
 
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
index 178b026..ef9ba9e 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
@@ -68,6 +68,7 @@
             ));
 
     private static ArrayList<CellBroadcastChannelRange> sAllCellBroadcastChannelRanges = null;
+    private static final Object channelRangesLock = new Object();
 
     private final Context mContext;
 
@@ -94,6 +95,21 @@
         private static final String KEY_OVERRIDE_DND = "override_dnd";
         /** Defines whether writing alert message should exclude from SMS inbox. */
         private static final String KEY_EXCLUDE_FROM_SMS_INBOX = "exclude_from_sms_inbox";
+        /** Define whether to display this cellbroadcast messages. */
+        private static final String KEY_DISPLAY = "display";
+        /** Define whether to enable this only in test/debug mode. */
+        private static final String KEY_TESTING_MODE_ONLY = "testing_mode";
+        /** Define the channels which not allow opt-out. */
+        private static final String KEY_ALWAYS_ON = "always_on";
+        /** Define the duration of screen on in milliseconds. */
+        private static final String KEY_SCREEN_ON_DURATION = "screen_on_duration";
+        /** Define whether to display warning icon in the alert dialog. */
+        private static final String KEY_DISPLAY_ICON = "display_icon";
+        /** Define whether to dismiss the alert dialog for outside touches */
+        private static final String KEY_DISMISS_ON_OUTSIDE_TOUCH = "dismiss_on_outside_touch";
+        /** Define the ISO-639-1 language code associated with the alert message. */
+        private static final String KEY_LANGUAGE_CODE = "language";
+
 
         /**
          * Defines whether the channel needs language filter or not. True indicates that the alert
@@ -119,12 +135,25 @@
         public int mScope;
         public int[] mVibrationPattern;
         public boolean mFilterLanguage;
+        public boolean mDisplay;
+        public boolean mTestMode;
         // by default no custom alert duration. play the alert tone with the tone's duration.
         public int mAlertDuration = -1;
         public boolean mOverrideDnd = false;
         // If enable_write_alerts_to_sms_inbox is true, write to sms inbox is enabled by default
         // for all channels except for channels which explicitly set to exclude from sms inbox.
         public boolean mWriteToSmsInbox = true;
+        // only set to true for channels not allow opt-out. e.g, presidential alert.
+        public boolean mAlwaysOn = false;
+        // de default screen duration is 1min;
+        public int mScreenOnDuration = 60000;
+        // whether to display warning icon in the pop-up dialog;
+        public boolean mDisplayIcon = true;
+        // whether to dismiss the alert dialog on outside touch. Typically this should be false
+        // to avoid accidental dismisses of emergency messages
+        public boolean mDismissOnOutsideTouch = false;
+        // This is used to override dialog title language
+        public String mLanguageCode;
 
         public CellBroadcastChannelRange(Context context, int subId, String channelRange) {
 
@@ -136,6 +165,10 @@
                     CellBroadcastSettings.getResources(context, subId)
                             .getIntArray(R.array.default_vibration_pattern);
             mFilterLanguage = false;
+            // by default all received messages should be displayed.
+            mDisplay = true;
+            mTestMode = false;
+            boolean hasVibrationPattern = false;
 
             int colonIndex = channelRange.indexOf(':');
             if (colonIndex != -1) {
@@ -179,6 +212,7 @@
                                     for (int i = 0; i < vibration.length; i++) {
                                         mVibrationPattern[i] = Integer.parseInt(vibration[i]);
                                     }
+                                    hasVibrationPattern = true;
                                 }
                                 break;
                             case KEY_FILTER_LANGUAGE:
@@ -199,12 +233,49 @@
                                     mWriteToSmsInbox = false;
                                 }
                                 break;
+                            case KEY_DISPLAY:
+                                if (value.equalsIgnoreCase("false")) {
+                                    mDisplay = false;
+                                }
+                                break;
+                            case KEY_TESTING_MODE_ONLY:
+                                if (value.equalsIgnoreCase("true")) {
+                                    mTestMode = true;
+                                }
+                                break;
+                            case KEY_ALWAYS_ON:
+                                if (value.equalsIgnoreCase("true")) {
+                                    mAlwaysOn = true;
+                                }
+                                break;
+                            case KEY_SCREEN_ON_DURATION:
+                                mScreenOnDuration = Integer.parseInt(value);
+                                break;
+                            case KEY_DISPLAY_ICON:
+                                if (value.equalsIgnoreCase("false")) {
+                                    mDisplayIcon = false;
+                                }
+                                break;
+                            case KEY_DISMISS_ON_OUTSIDE_TOUCH:
+                                if (value.equalsIgnoreCase("true")) {
+                                    mDismissOnOutsideTouch = true;
+                                }
+                                break;
+                            case KEY_LANGUAGE_CODE:
+                                mLanguageCode = value;
+                                break;
                         }
                     }
                 }
                 channelRange = channelRange.substring(0, colonIndex).trim();
             }
 
+            // If alert type is info, override vibration pattern
+            if (!hasVibrationPattern && mAlertType.equals(AlertType.INFO)) {
+                mVibrationPattern = CellBroadcastSettings.getResources(context, subId)
+                        .getIntArray(R.array.default_notification_vibration_pattern);
+            }
+
             // Parse the channel range
             int dashIndex = channelRange.indexOf('-');
             if (dashIndex != -1) {
@@ -222,7 +293,11 @@
             return "Range:[channels=" + mStartId + "-" + mEndId + ",emergency level="
                     + mEmergencyLevel + ",type=" + mAlertType + ",scope=" + mScope + ",vibration="
                     + Arrays.toString(mVibrationPattern) + ",alertDuration=" + mAlertDuration
-                    + ",filter_language=" + mFilterLanguage + ",override_dnd=" + mOverrideDnd + "]";
+                    + ",filter_language=" + mFilterLanguage + ",override_dnd=" + mOverrideDnd
+                    + ",display=" + mDisplay + ",testMode=" + mTestMode + ",mAlwaysOn="
+                    + mAlwaysOn + ",ScreenOnDuration=" + mScreenOnDuration + ", displayIcon="
+                    + mDisplayIcon + "dismissOnOutsideTouch=" + mDismissOnOutsideTouch
+                    + ", languageCode=" + mLanguageCode + "]";
         }
     }
 
@@ -248,15 +323,15 @@
         ArrayList<CellBroadcastChannelRange> result = new ArrayList<>();
         String[] ranges =
                 CellBroadcastSettings.getResources(mContext, mSubId).getStringArray(key);
-
-        for (String range : ranges) {
-            try {
-                result.add(new CellBroadcastChannelRange(mContext, mSubId, range));
-            } catch (Exception e) {
-                loge("Failed to parse \"" + range + "\". e=" + e);
+        if (ranges != null) {
+            for (String range : ranges) {
+                try {
+                    result.add(new CellBroadcastChannelRange(mContext, mSubId, range));
+                } catch (Exception e) {
+                    loge("Failed to parse \"" + range + "\". e=" + e);
+                }
             }
         }
-
         return result;
     }
 
@@ -266,16 +341,31 @@
      * @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;
+            }
+        }
     }
 
     /**
@@ -416,10 +506,6 @@
         return message.isEmergencyMessage();
     }
 
-    private static void log(String msg) {
-        Log.d(TAG, msg);
-    }
-
     private static void loge(String msg) {
         Log.e(TAG, msg);
     }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
index c290dd8..9b9b75a 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastConfigService.java
@@ -19,6 +19,9 @@
 import static com.android.cellbroadcastreceiver.CellBroadcastReceiver.VDBG;
 
 import android.app.IntentService;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -33,6 +36,7 @@
 
 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;
@@ -55,6 +59,7 @@
 
     @VisibleForTesting
     public static final String ACTION_ENABLE_CHANNELS = "ACTION_ENABLE_CHANNELS";
+    public static final String ACTION_UPDATE_SETTINGS_FOR_CARRIER = "UPDATE_SETTINGS_FOR_CARRIER";
 
     public CellBroadcastConfigService() {
         super(TAG);          // use class name for worker thread name
@@ -85,6 +90,34 @@
             } catch (Exception ex) {
                 Log.e(TAG, "exception enabling cell broadcast channels", ex);
             }
+        } else if (ACTION_UPDATE_SETTINGS_FOR_CARRIER.equals(intent.getAction())) {
+            Context c = getApplicationContext();
+            if (CellBroadcastSettings.hasAnyPreferenceChanged(c)) {
+                Log.d(TAG, "Preference has changed from user set, posting notification.");
+
+                CellBroadcastAlertService.createNotificationChannels(c);
+                Intent settingsIntent = new Intent(c, CellBroadcastSettings.class);
+                PendingIntent pi = PendingIntent.getActivity(c,
+                        CellBroadcastAlertService.SETTINGS_CHANGED_NOTIFICATION_ID, settingsIntent,
+                        PendingIntent.FLAG_ONE_SHOT
+                                | PendingIntent.FLAG_UPDATE_CURRENT
+                                | PendingIntent.FLAG_IMMUTABLE);
+
+                Notification.Builder builder = new Notification.Builder(c,
+                        CellBroadcastAlertService.NOTIFICATION_CHANNEL_SETTINGS_UPDATES)
+                        .setCategory(Notification.CATEGORY_SYSTEM)
+                        .setContentTitle(c.getString(R.string.notification_cb_settings_changed_title))
+                        .setContentText(c.getString(R.string.notification_cb_settings_changed_text))
+                        .setSmallIcon(R.drawable.ic_settings_gear_outline_24dp)
+                        .setContentIntent(pi);
+                NotificationManager notificationManager = c.getSystemService(
+                        NotificationManager.class);
+                notificationManager.notify(
+                        CellBroadcastAlertService.SETTINGS_CHANGED_NOTIFICATION_ID,
+                        builder.build());
+            }
+            Log.e(TAG, "Reset all preferences");
+            CellBroadcastSettings.resetAllPreferences(getApplicationContext());
         }
     }
 
@@ -106,13 +139,17 @@
         } 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);
+            }
         }
     }
 
@@ -131,7 +168,7 @@
 
         // boolean for each user preference checkbox, true for checked, false for unchecked
         // Note: If enableAlertsMasterToggle is false, it disables ALL emergency broadcasts
-        // except for CMAS presidential. i.e. to receive CMAS severe alerts, both
+        // except for always-on alerts e.g, presidential. i.e. to receive CMAS severe alerts, both
         // enableAlertsMasterToggle AND enableCmasSevereAlerts must be true.
         boolean enableAlertsMasterToggle = prefs.getBoolean(
                 CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE, true);
@@ -155,6 +192,14 @@
                 && CellBroadcastSettings.isTestAlertsToggleVisible(getApplicationContext())
                 && prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_TEST_ALERTS, false);
 
+        boolean enableExerciseAlerts = enableAlertsMasterToggle
+                && res.getBoolean(R.bool.show_separate_exercise_settings)
+                && prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_EXERCISE_ALERTS, false);
+
+        boolean enableOperatorDefined = enableAlertsMasterToggle
+                && res.getBoolean(R.bool.show_separate_operator_defined_settings)
+                && prefs.getBoolean(CellBroadcastSettings.KEY_OPERATOR_DEFINED_ALERTS, false);
+
         boolean enableAreaUpdateInfoAlerts = res.getBoolean(
                 R.bool.config_showAreaUpdateInfoSettings)
                 && prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_AREA_UPDATE_INFO_ALERTS,
@@ -180,6 +225,8 @@
             log("enableCmasSevereAlerts = " + enableCmasExtremeAlerts);
             log("enableCmasAmberAlerts = " + enableCmasAmberAlerts);
             log("enableTestAlerts = " + enableTestAlerts);
+            log("enableExerciseAlerts = " + enableExerciseAlerts);
+            log("enableOperatorDefinedAlerts = " + enableOperatorDefined);
             log("enableAreaUpdateInfoAlerts = " + enableAreaUpdateInfoAlerts);
             log("enablePublicSafetyMessagesChannelAlerts = "
                     + enablePublicSafetyMessagesChannelAlerts);
@@ -218,14 +265,15 @@
                 channelManager.getCellBroadcastChannelRanges(
                         R.array.required_monthly_test_range_strings));
 
-        // Exercise is part of test toggle with monthly test and operator defined. some carriers
-        // mandate to show test settings in UI but always enable exercise alert.
-        setCellBroadcastRange(subId, enableTestAlerts ||
-                        res.getBoolean(R.bool.always_enable_exercise_alert),
+        // Enable/Disable exercise test messages.
+        // This could either controlled by main test toggle or separate exercise test toggle.
+        setCellBroadcastRange(subId, enableTestAlerts || enableExerciseAlerts,
                 channelManager.getCellBroadcastChannelRanges(
                         R.array.exercise_alert_range_strings));
 
-        setCellBroadcastRange(subId, enableTestAlerts,
+        // Enable/Disable operator defined test messages.
+        // This could either controlled by main test toggle or separate operator defined test toggle
+        setCellBroadcastRange(subId, enableTestAlerts || enableOperatorDefined,
                 channelManager.getCellBroadcastChannelRanges(
                         R.array.operator_defined_alert_range_strings));
 
@@ -296,6 +344,11 @@
 
         if (ranges != null) {
             for (CellBroadcastChannelRange range: ranges) {
+                if (range.mAlwaysOn) {
+                    log("mAlwaysOn is set to true, enable the range: " + range.mStartId
+                            + ":" + range.mEndId);
+                    enable = true;
+                }
                 if (enable) {
                     manager.enableCellBroadcastRange(range.mStartId, range.mEndId, range.mRanType);
                 } else {
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastContentProvider.java b/src/com/android/cellbroadcastreceiver/CellBroadcastContentProvider.java
index 6c93104..9862472 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastContentProvider.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastContentProvider.java
@@ -16,17 +16,20 @@
 
 package com.android.cellbroadcastreceiver;
 
+import android.annotation.NonNull;
 import android.content.ContentProvider;
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.UriMatcher;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserManager;
 import android.provider.Telephony;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbEtwsInfo;
@@ -34,8 +37,11 @@
 import android.telephony.SmsCbMessage;
 import android.text.TextUtils;
 import android.util.Log;
+
 import com.android.internal.annotations.VisibleForTesting;
 
+import java.util.concurrent.CountDownLatch;
+
 /**
  * ContentProvider for the database of received cell broadcasts.
  */
@@ -46,7 +52,8 @@
     private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
 
     /** Authority string for content URIs. */
-    static final String CB_AUTHORITY = "cellbroadcasts-app";
+    @VisibleForTesting
+    public static final String CB_AUTHORITY = "cellbroadcasts-app";
 
     /** Content URI for notifying observers. */
     static final Uri CONTENT_URI = Uri.parse("content://cellbroadcasts-app/");
@@ -63,14 +70,24 @@
     /** MIME type for an individual cell broadcast. */
     private static final String CB_TYPE = "vnd.android.cursor.item/cellbroadcast";
 
+    public static final String CALL_MIGRATION_METHOD = "migrate-legacy-data";
+
     static {
         sUriMatcher.addURI(CB_AUTHORITY, null, CB_ALL);
         sUriMatcher.addURI(CB_AUTHORITY, "#", CB_ALL_ID);
     }
 
-    /** The database for this content provider. */
+    /**
+     * The database for this content provider. Before using this we need to wait on
+     * mInitializedLatch, which counts down once initialization finishes in a background thread
+     */
+
     @VisibleForTesting
-    public SQLiteOpenHelper mOpenHelper;
+    public CellBroadcastDatabaseHelper mOpenHelper;
+
+    // Latch which counts down from 1 when initialization in CellBroadcastOpenHelper.tryToMigrateV13
+    // is finished
+    private final CountDownLatch mInitializedLatch = new CountDownLatch(1);
 
     /**
      * Initialize content provider.
@@ -83,10 +100,39 @@
         // the first query/update/insertion. Data migration is done inside db creation and we want
         // to migrate data from cellbroadcast-legacy immediately when upgrade to the mainline module
         // rather than migrate after the first emergency alert.
-        mOpenHelper.getReadableDatabase();
+        // getReadable database will also call tryToMigrateV13 which copies the DB file to allow
+        // for safe rollbacks.
+        // This is done in a background thread to avoid triggering an ANR if the disk operations are
+        // too slow, and all other database uses should wait for the latch.
+        new Thread(() -> {
+            mOpenHelper.getReadableDatabase();
+            mInitializedLatch.countDown();
+        }).start();
         return true;
     }
 
+    protected SQLiteDatabase awaitInitAndGetWritableDatabase() {
+        while (mInitializedLatch.getCount() != 0) {
+            try {
+                mInitializedLatch.await();
+            } catch (InterruptedException e) {
+                Log.e(TAG, "Interrupted while waiting for db initialization. e=" + e);
+            }
+        }
+        return mOpenHelper.getWritableDatabase();
+    }
+
+    protected SQLiteDatabase awaitInitAndGetReadableDatabase() {
+        while (mInitializedLatch.getCount() != 0) {
+            try {
+                mInitializedLatch.await();
+            } catch (InterruptedException e) {
+                Log.e(TAG, "Interrupted while waiting for db initialization. e=" + e);
+            }
+        }
+        return mOpenHelper.getReadableDatabase();
+    }
+
     /**
      * Return a cursor for the cell broadcast table.
      * @param uri the URI to query.
@@ -126,7 +172,7 @@
             orderBy = Telephony.CellBroadcasts.DEFAULT_SORT_ORDER;
         }
 
-        SQLiteDatabase db = mOpenHelper.getReadableDatabase();
+        SQLiteDatabase db = awaitInitAndGetReadableDatabase();
         Cursor c = qb.query(db, projection, selection, selectionArgs, null, null, orderBy);
         if (c != null) {
             c.setNotificationUri(getContext().getContentResolver(), CONTENT_URI);
@@ -191,6 +237,19 @@
         throw new UnsupportedOperationException("update not supported");
     }
 
+    @Override
+    public Bundle call(String method, String name, Bundle args) {
+        Log.d(TAG, "call:"
+                + " method=" + method
+                + " name=" + name
+                + " args=" + args);
+        // this is to handle a content-provider defined method: migration
+        if (CALL_MIGRATION_METHOD.equals(method)) {
+            mOpenHelper.migrateFromLegacyIfNeeded(awaitInitAndGetReadableDatabase());
+        }
+        return null;
+    }
+
     private ContentValues getContentValues(SmsCbMessage message) {
         ContentValues cv = new ContentValues();
         cv.put(Telephony.CellBroadcasts.SLOT_INDEX, message.getSlotIndex());
@@ -236,7 +295,7 @@
      */
     @VisibleForTesting
     public boolean insertNewBroadcast(SmsCbMessage message) {
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        SQLiteDatabase db = awaitInitAndGetWritableDatabase();
         ContentValues cv = getContentValues(message);
 
         // Note: this method previously queried the database for duplicate message IDs, but this
@@ -262,7 +321,7 @@
      */
     @VisibleForTesting
     public boolean deleteBroadcast(long rowId) {
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        SQLiteDatabase db = awaitInitAndGetWritableDatabase();
 
         int rowCount = db.delete(CellBroadcastDatabaseHelper.TABLE_NAME,
                 Telephony.CellBroadcasts._ID + "=?",
@@ -281,7 +340,7 @@
      */
     @VisibleForTesting
     public boolean deleteAllBroadcasts() {
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        SQLiteDatabase db = awaitInitAndGetWritableDatabase();
 
         int rowCount = db.delete(CellBroadcastDatabaseHelper.TABLE_NAME, null, null);
         if (rowCount != 0) {
@@ -302,7 +361,7 @@
      * @return true if the database was updated, false otherwise
      */
     boolean markBroadcastRead(String columnName, long columnValue) {
-        SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+        SQLiteDatabase db = awaitInitAndGetWritableDatabase();
 
         ContentValues cv = new ContentValues(1);
         cv.put(Telephony.CellBroadcasts.MESSAGE_READ, 1);
@@ -319,6 +378,120 @@
         }
     }
 
+    /**
+     * Internal method to mark a broadcast received in direct boot mode. After user unlocks, mark
+     * all messages not in direct boot mode.
+     *
+     * @param columnName the column name to query (ID or delivery time)
+     * @param columnValue the ID or delivery time of the broadcast to mark read
+     * @param isSmsSyncPending whether the message was pending for SMS inbox synchronization
+     * @return true if the database was updated, false otherwise
+     */
+    @VisibleForTesting
+    public boolean markBroadcastSmsSyncPending(String columnName, long columnValue,
+            boolean isSmsSyncPending) {
+        SQLiteDatabase db = awaitInitAndGetWritableDatabase();
+
+        ContentValues cv = new ContentValues(1);
+        cv.put(CellBroadcastDatabaseHelper.SMS_SYNC_PENDING, isSmsSyncPending ? 1 : 0);
+
+        String whereClause = columnName + "=?";
+        String[] whereArgs = new String[]{Long.toString(columnValue)};
+
+        int rowCount = db.update(CellBroadcastDatabaseHelper.TABLE_NAME, cv, whereClause,
+                whereArgs);
+        if (rowCount != 0) {
+            return true;
+        } else {
+            Log.e(TAG, "failed to mark broadcast pending for sms inbox sync:  " + isSmsSyncPending
+                    + " where: " + columnName + " = " + columnValue);
+            return false;
+        }
+    }
+
+    /**
+     * Write message to sms inbox if pending. e.g, when receive alerts in direct boot mode, we
+     * might need to sync message to sms inbox after user unlock.
+     * @param context
+     */
+
+    @VisibleForTesting
+    public void resyncToSmsInbox(@NonNull Context context) {
+        // query all messages currently marked as sms inbox sync pending
+        try (Cursor cursor = query(
+                CellBroadcastContentProvider.CONTENT_URI,
+                CellBroadcastDatabaseHelper.QUERY_COLUMNS,
+                CellBroadcastDatabaseHelper.SMS_SYNC_PENDING + "=1",
+                null, null)) {
+            if (cursor != null) {
+                while (cursor.moveToNext()) {
+                    SmsCbMessage message = CellBroadcastCursorAdapter
+                            .createFromCursor(context, cursor);
+                    if (message != null) {
+                        Log.d(TAG, "handling message received pending for sms sync: "
+                                + message.toString());
+                        writeMessageToSmsInbox(message, context);
+                        // mark message received in direct mode was handled
+                        markBroadcastSmsSyncPending(
+                                Telephony.CellBroadcasts.DELIVERY_TIME,
+                                message.getReceivedTime(), false);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Write displayed cellbroadcast messages to sms inbox
+     *
+     * @param message The cell broadcast message.
+     */
+    @VisibleForTesting
+    public void writeMessageToSmsInbox(@NonNull SmsCbMessage message, @NonNull Context context) {
+        UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        if (!userManager.isSystemUser()) {
+            // SMS database is single-user mode, discard non-system users to avoid inserting twice.
+            Log.d(TAG, "ignoring writeMessageToSmsInbox due to non-system user");
+            return;
+        }
+        // Note SMS database is not direct boot aware for privacy reasons, we should only interact
+        // with sms db until users has unlocked.
+        if (!userManager.isUserUnlocked()) {
+            Log.d(TAG, "ignoring writeMessageToSmsInbox due to direct boot mode");
+            // need to retry after user unlock
+            markBroadcastSmsSyncPending(Telephony.CellBroadcasts.DELIVERY_TIME,
+                        message.getReceivedTime(), true);
+            return;
+        }
+        // composing SMS
+        ContentValues cv = new ContentValues();
+        cv.put(Telephony.Sms.Inbox.BODY, message.getMessageBody());
+        cv.put(Telephony.Sms.Inbox.DATE, message.getReceivedTime());
+        cv.put(Telephony.Sms.Inbox.SUBSCRIPTION_ID, message.getSubscriptionId());
+        cv.put(Telephony.Sms.Inbox.SUBJECT, context.getString(
+                CellBroadcastResources.getDialogTitleResource(context, message)));
+        cv.put(Telephony.Sms.Inbox.ADDRESS,
+                CellBroadcastResources.getSmsSenderAddressResourceEnglishString(context, message));
+        cv.put(Telephony.Sms.Inbox.THREAD_ID, Telephony.Threads.getOrCreateThreadId(context,
+                CellBroadcastResources.getSmsSenderAddressResourceEnglishString(context, message)));
+        if (CellBroadcastSettings.getResources(context, message.getSubscriptionId())
+                .getBoolean(R.bool.always_mark_sms_read)) {
+            // Always mark SMS message READ. End users expect when they read new CBS messages,
+            // the unread alert count in the notification should be decreased, as they thought it
+            // was coming from SMS. Now we are marking those SMS as read (SMS now serve as a message
+            // history purpose) and that should give clear messages to end-users that alerts are not
+            // from the SMS app but CellBroadcast and they should tap the notification to read alert
+            // in order to see decreased unread message count.
+            cv.put(Telephony.Sms.Inbox.READ, 1);
+        }
+        Uri uri = context.getContentResolver().insert(Telephony.Sms.Inbox.CONTENT_URI, cv);
+        if (uri == null) {
+            Log.e(TAG, "writeMessageToSmsInbox: failed");
+        } else {
+            Log.d(TAG, "writeMessageToSmsInbox: succeed uri = " + uri);
+        }
+    }
+
     /** Callback for users of AsyncCellBroadcastOperation. */
     interface CellBroadcastOperation {
         /**
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastCursorAdapter.java b/src/com/android/cellbroadcastreceiver/CellBroadcastCursorAdapter.java
index 5159b89..c27b7cd 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastCursorAdapter.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastCursorAdapter.java
@@ -24,9 +24,11 @@
 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 @@
  */
 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 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 c64295a..2946fba 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastDatabaseHelper.java
@@ -16,20 +16,26 @@
 
 package com.android.cellbroadcastreceiver;
 
+import static java.nio.file.Files.copy;
+
 import android.annotation.NonNull;
 import android.content.ContentProviderClient;
 import android.content.ContentValues;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.RemoteException;
+import android.preference.PreferenceManager;
 import android.provider.Telephony;
 import android.provider.Telephony.CellBroadcasts;
 import android.util.Log;
 
 import com.android.internal.annotations.VisibleForTesting;
 
+import java.io.File;
+
 /**
  * Open, create, and upgrade the cell broadcast SQLite database. Previously an inner class of
  * {@code CellBroadcastDatabase}, this is now a top-level class. The column definitions in
@@ -40,10 +46,32 @@
 
     private static final String TAG = "CellBroadcastDatabaseHelper";
 
-    private static final String DATABASE_NAME = "cell_broadcasts.db";
+    /**
+     * Database version 1: initial version (support removed)
+     * Database version 2-9: (reserved for OEM database customization) (support removed)
+     * Database version 10: adds ETWS and CMAS columns and CDMA support (support removed)
+     * Database version 11: adds delivery time index
+     * Database version 12: add slotIndex
+     * Database version 13: add smsSyncPending
+     */
+    private static final int DATABASE_VERSION = 13;
+
+    private static final String OLD_DATABASE_NAME = "cell_broadcasts.db";
+    private static final String DATABASE_NAME_V13 = "cell_broadcasts_v13.db";
     @VisibleForTesting
     public static final String TABLE_NAME = "broadcasts";
 
+    // Preference key for whether the data migration from pre-R CBR app was complete.
+    public static final String KEY_LEGACY_DATA_MIGRATION = "legacy_data_migration";
+
+    /**
+     * Is the message pending for sms synchronization.
+     * when received cellbroadcast message in direct boot mode, we will retry synchronizing
+     * alert message to sms inbox after user unlock if needed.
+     * <P>Type: Boolean</P>
+     */
+    public static final String SMS_SYNC_PENDING = "isSmsSyncPending";
+
     /*
      * Query columns for instantiating SmsCbMessage.
      */
@@ -98,25 +126,25 @@
                 + Telephony.CellBroadcasts.CMAS_RESPONSE_TYPE + " INTEGER,"
                 + Telephony.CellBroadcasts.CMAS_SEVERITY + " INTEGER,"
                 + Telephony.CellBroadcasts.CMAS_URGENCY + " INTEGER,"
-                + Telephony.CellBroadcasts.CMAS_CERTAINTY + " INTEGER);";
+                + Telephony.CellBroadcasts.CMAS_CERTAINTY + " INTEGER,"
+                + SMS_SYNC_PENDING + " BOOLEAN);";
     }
 
-
-    /**
-     * Database version 1: initial version (support removed)
-     * Database version 2-9: (reserved for OEM database customization) (support removed)
-     * Database version 10: adds ETWS and CMAS columns and CDMA support (support removed)
-     * Database version 11: adds delivery time index
-     * Database version 12: add slotIndex
-     */
-    private static final int DATABASE_VERSION = 12;
-
     private final Context mContext;
     final boolean mLegacyProvider;
 
+    private ContentProviderClient mOverrideContentProviderClient = null;
+
     @VisibleForTesting
     public CellBroadcastDatabaseHelper(Context context, boolean legacyProvider) {
-        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        super(context, DATABASE_NAME_V13, null, DATABASE_VERSION);
+        mContext = context;
+        mLegacyProvider = legacyProvider;
+    }
+
+    @VisibleForTesting
+    public CellBroadcastDatabaseHelper(Context context, boolean legacyProvider, String dbName) {
+        super(context, dbName, null, DATABASE_VERSION);
         mContext = context;
         mLegacyProvider = legacyProvider;
     }
@@ -128,7 +156,7 @@
         db.execSQL("CREATE INDEX IF NOT EXISTS deliveryTimeIndex ON " + TABLE_NAME
                 + " (" + Telephony.CellBroadcasts.DELIVERY_TIME + ");");
         if (!mLegacyProvider) {
-            migrateFromLegacy(db);
+            migrateFromLegacyIfNeeded(db);
         }
     }
 
@@ -144,6 +172,61 @@
             db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN "
                     + Telephony.CellBroadcasts.SLOT_INDEX + " INTEGER DEFAULT 0;");
         }
+        if (oldVersion < 13) {
+            db.execSQL("ALTER TABLE " + TABLE_NAME + " ADD COLUMN " + SMS_SYNC_PENDING
+                    + " BOOLEAN DEFAULT 0;");
+        }
+    }
+
+    private synchronized void tryToMigrateV13() {
+        File oldDb = mContext.getDatabasePath(OLD_DATABASE_NAME);
+        File newDb = mContext.getDatabasePath(DATABASE_NAME_V13);
+        if (!oldDb.exists()) {
+            return;
+        }
+        // We do the DB copy in two scenarios:
+        //   1. device receives v13 upgrade.
+        //   2. device receives v13 upgrade, gets rollback to v12, then receives v13 upgrade again.
+        //      If the DB is modified after rollback, we want to copy those changes again.
+        if (!newDb.exists() || oldDb.lastModified() > newDb.lastModified()) {
+            try {
+                // copy() requires that the destination file does not exist
+                Log.d(TAG, "copying to v13 db");
+                if (newDb.exists()) newDb.delete();
+                copy(oldDb.toPath(), newDb.toPath());
+            } catch (Exception e) {
+                // If the copy failed we don't know if the db is in a safe state, so just delete it
+                // and continue with an empty new db. Ignore the exception and just log an error.
+                mContext.deleteDatabase(DATABASE_NAME_V13);
+                loge("could not copy DB to v13. e=" + e);
+            }
+        }
+        // else the V13 database has already been created.
+    }
+
+    @Override
+    public SQLiteDatabase getReadableDatabase() {
+        tryToMigrateV13();
+        return super.getReadableDatabase();
+    }
+
+    @Override
+    public SQLiteDatabase getWritableDatabase() {
+        tryToMigrateV13();
+        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);
     }
 
     /**
@@ -153,9 +236,14 @@
      * from OEM app.
      */
     @VisibleForTesting
-    public void migrateFromLegacy(@NonNull SQLiteDatabase db) {
-        try (ContentProviderClient client = mContext.getContentResolver()
-                .acquireContentProviderClient(Telephony.CellBroadcasts.AUTHORITY_LEGACY)) {
+    public void migrateFromLegacyIfNeeded(@NonNull SQLiteDatabase db) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
+        if (sp.getBoolean(CellBroadcastDatabaseHelper.KEY_LEGACY_DATA_MIGRATION, false)) {
+            log("Data migration was complete already");
+            return;
+        }
+
+        try (ContentProviderClient client = getContentProviderClient()) {
             if (client == null) {
                 log("No legacy provider available for migration");
                 return;
@@ -172,6 +260,8 @@
                     for (String column : QUERY_COLUMNS) {
                         copyFromCursorToContentValues(column, c, values);
                     }
+                    // remove the primary key to avoid UNIQUE constraint failure.
+                    values.remove(Telephony.CellBroadcasts._ID);
 
                     try {
                         if (db.insert(TABLE_NAME, null, values) == -1) {
@@ -201,8 +291,10 @@
             // We have to guard ourselves against any weird behavior of the
             // legacy provider by trying to catch everything
             loge("Failed migration from legacy provider: " + e);
+        } finally {
+            // Mark data migration was triggered to make sure this is done only once.
+            sp.edit().putBoolean(KEY_LEGACY_DATA_MIGRATION, true).commit();
         }
-
     }
 
     public static void copyFromCursorToContentValues(@NonNull String column, @NonNull Cursor cursor,
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java b/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
index 39192a0..9174c30 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastListActivity.java
@@ -20,12 +20,12 @@
 
 import android.annotation.Nullable;
 import android.app.ActionBar;
-import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
 import android.app.FragmentManager;
 import android.app.ListFragment;
 import android.app.LoaderManager;
-import android.app.NotificationManager;
 import android.content.Context;
 import android.content.CursorLoader;
 import android.content.DialogInterface;
@@ -35,21 +35,26 @@
 import android.database.Cursor;
 import android.net.Uri;
 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.modules.utils.build.SdkLevel;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 
 import java.util.ArrayList;
 
@@ -57,33 +62,37 @@
  * 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;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        // for backward compatibility on R devices
+        if (!SdkLevel.isAtLeastS()) {
+            setCustomizeContentView(R.layout.cell_broadcast_list_collapsing_no_toobar);
+        }
         super.onCreate(savedInstanceState);
-
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null) {
-            // android.R.id.home will be triggered in onOptionsItemSelected()
-            actionBar.setDisplayHomeAsUpEnabled(true);
+        // for backward compatibility on R devices
+        if (!SdkLevel.isAtLeastS()) {
+            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));
 
-        // Dismiss the notification that brought us here (if any).
-        ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE))
-                .cancel(CellBroadcastAlertService.NOTIFICATION_ID);
-
         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();
         }
     }
 
@@ -119,6 +128,8 @@
         public static final int MENU_SHOW_REGULAR_MESSAGES = 4;
         @VisibleForTesting
         public static final int MENU_SHOW_ALL_MESSAGES     = 5;
+        @VisibleForTesting
+        public static final int MENU_PREFERENCES           = 6;
 
         // Load the history from cell broadcast receiver database
         private static final int LOADER_NORMAL_HISTORY      = 1;
@@ -129,6 +140,8 @@
         @VisibleForTesting
         public static final String KEY_LOADER_ID = "loader_id";
 
+        public static final String KEY_DELETE_DIALOG = "delete_dialog";
+
         // IDs of the context menu items (package local, accessed from inner DeleteThreadListener).
         @VisibleForTesting
         public static final int MENU_DELETE               = 0;
@@ -175,12 +188,16 @@
 
         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
@@ -195,12 +212,73 @@
 
             // 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);
@@ -235,6 +313,11 @@
                     android.R.drawable.ic_menu_delete);
             menu.add(0, MENU_SHOW_ALL_MESSAGES, 0, R.string.show_all_messages);
             menu.add(0, MENU_SHOW_REGULAR_MESSAGES, 0, R.string.show_regular_messages);
+            final UserManager userManager = getContext().getSystemService(UserManager.class);
+            if (userManager.isAdminUser()) {
+                menu.add(0, MENU_PREFERENCES, 0, R.string.menu_preferences).setIcon(
+                        android.R.drawable.ic_menu_preferences);
+            }
         }
 
         @Override
@@ -320,20 +403,60 @@
                     .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));
+                }
             }
         }
 
@@ -389,8 +512,8 @@
             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:
@@ -410,7 +533,8 @@
         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:
@@ -421,6 +545,11 @@
                     getLoaderManager().restartLoader(LOADER_NORMAL_HISTORY, null, this);
                     break;
 
+                case MENU_PREFERENCES:
+                    Intent intent = new Intent(getActivity(), CellBroadcastSettings.class);
+                    startActivity(intent);
+                    break;
+
                 default:
                     return true;
             }
@@ -429,37 +558,56 @@
 
         /**
          * 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) {
-            DeleteThreadListener listener = new DeleteThreadListener(rowId);
-            confirmDeleteThreadDialog(listener, (rowId == -1), getActivity());
+        public void confirmDeleteThread(long[] rowId) {
+            DeleteDialogFragment dialog = new DeleteDialogFragment();
+            Bundle dialogArgs = new Bundle();
+            dialogArgs.putLongArray(DeleteDialogFragment.ROW_ID, rowId);
+            dialog.setArguments(dialogArgs);
+            dialog.show(getFragmentManager(), KEY_DELETE_DIALOG);
         }
 
-        /**
-         * Build and show the proper delete broadcast dialog. The UI is slightly different
-         * depending on whether there are locked messages in the thread(s) and whether we're
-         * deleting a single broadcast or all broadcasts.
-         * @param listener gets called when the delete button is pressed
-         * @param deleteAll whether to show a single thread or all threads UI
-         * @param context used to load the various UI elements
-         */
-        public static void confirmDeleteThreadDialog(DeleteThreadListener listener,
-                boolean deleteAll, Context context) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.button_delete, listener)
-                    .setNegativeButton(R.string.button_cancel, null)
-                    .setMessage(deleteAll ? R.string.confirm_delete_all_broadcasts
-                            : R.string.confirm_delete_broadcast)
-                    .show();
+        public static class DeleteDialogFragment extends DialogFragment {
+            /**
+             * Key for the row id of the message to delete. If the row id is -1, the displayed
+             * dialog will indicate that all messages are to be deleted.
+             */
+            public static final String ROW_ID = "row_id";
+            @Override
+            public Dialog onCreateDialog(Bundle savedInstanceState) {
+                setRetainInstance(true);
+                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());
+                builder.setIconAttribute(android.R.attr.alertDialogIcon)
+                        .setCancelable(true)
+                        .setPositiveButton(R.string.button_delete, listener)
+                        .setNegativeButton(R.string.button_cancel, null)
+                        .setMessage(deleteAll ? R.string.confirm_delete_all_broadcasts
+                                : R.string.confirm_delete_broadcast);
+                return builder.create();
+            }
+
+            @Override
+            public void onDestroyView() {
+                Dialog dialog = getDialog();
+                if (dialog != null && getRetainInstance()) {
+                    dialog.setDismissMessage(null);
+                }
+                super.onDestroyView();
+            }
         }
 
-        public class DeleteThreadListener implements OnClickListener {
-            private final long mRowId;
+        public static class DeleteThreadListener implements OnClickListener {
+            private final long[] mRowId;
+            private final Context mContext;
 
-            public DeleteThreadListener(long rowId) {
+            public DeleteThreadListener(Context context, long[] rowId) {
+                mContext = context;
                 mRowId = rowId;
             }
 
@@ -467,10 +615,15 @@
             public void onClick(DialogInterface dialog, int whichButton) {
                 // delete from database on a background thread
                 new CellBroadcastContentProvider.AsyncCellBroadcastTask(
-                        getActivity().getContentResolver()).execute(
+                        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/CellBroadcastListItem.java b/src/com/android/cellbroadcastreceiver/CellBroadcastListItem.java
index 81b0c36..b5d6efa 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastListItem.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastListItem.java
@@ -82,7 +82,7 @@
             if (cursor != null) {
                 while (cursor.moveToNext()) {
                     if (cursor.getInt(cursor.getColumnIndexOrThrow(
-                            Telephony.CellBroadcasts.MESSAGE_READ)) != 0) {
+                            Telephony.CellBroadcasts.MESSAGE_READ)) == 0) {
                         messageText.setSpan(new StyleSpan(Typeface.BOLD), 0, messageText.length(),
                                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                         break;
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
index 87c2e0c..b767d6b 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
@@ -32,7 +32,7 @@
 import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.os.UserManager;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.provider.Telephony;
 import android.provider.Telephony.CellBroadcasts;
 import android.telephony.CarrierConfigManager;
@@ -72,6 +72,14 @@
     // shared preference under developer settings
     private static final String ENABLE_ALERT_MASTER_PREF = "enable_alerts_master_toggle";
 
+    // shared preference for alert reminder interval
+    private static final String ALERT_REMINDER_INTERVAL_PREF = "alert_reminder_interval";
+
+    // SharedPreferences key used to store the last carrier
+    private static final String CARRIER_ID_FOR_DEFAULT_SUB_PREF = "carrier_id_for_default_sub";
+    // initial value for saved carrier ID. This helps us detect newly updated users or first boot
+    private static final int NO_PREVIOUS_CARRIER_ID = -2;
+
     public static final String ACTION_SERVICE_STATE = "android.intent.action.SERVICE_STATE";
     public static final String EXTRA_VOICE_REG_STATE = "voiceRegState";
 
@@ -95,8 +103,7 @@
      */
     @VisibleForTesting
     public Resources getResourcesMethod() {
-        return CellBroadcastSettings.getResources(mContext,
-                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+        return CellBroadcastSettings.getResourcesForDefaultSubId(mContext);
     }
 
     @Override
@@ -112,10 +119,27 @@
             // read. Log an event.
             EventLog.writeEvent(0x534e4554, "162741784", -1, null);
         } else if (CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED.equals(action)) {
-            if (!intent.getBooleanExtra("android.telephony.extra.REBROADCAST_ON_UNLOCK", false)) {
-                initializeSharedPreference();
+            if (!intent.getBooleanExtra(
+                    "android.telephony.extra.REBROADCAST_ON_UNLOCK", false)) {
+                int subId = intent.getIntExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX,
+                        SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                initializeSharedPreference(context, subId);
                 enableLauncher();
-                startConfigService();
+                startConfigServiceToEnableChannels();
+                // Some OEMs do not have legacyMigrationProvider active during boot-up, thus we
+                // need to retry data migration from another trigger point.
+                boolean hasMigrated = getDefaultSharedPreferences()
+                        .getBoolean(CellBroadcastDatabaseHelper.KEY_LEGACY_DATA_MIGRATION, false);
+                if (res.getBoolean(R.bool.retry_message_history_data_migration) && !hasMigrated) {
+                    // migrate message history from legacy app on a background thread.
+                    new CellBroadcastContentProvider.AsyncCellBroadcastTask(
+                            mContext.getContentResolver()).execute(
+                            (CellBroadcastContentProvider.CellBroadcastOperation) provider -> {
+                                provider.call(CellBroadcastContentProvider.CALL_MIGRATION_METHOD,
+                                        null, null);
+                                return true;
+                            });
+                }
             }
         } else if (ACTION_SERVICE_STATE.equals(action)) {
             // lower layer clears channel configurations under APM, thus need to resend
@@ -124,12 +148,12 @@
             int ss = intent.getIntExtra(EXTRA_VOICE_REG_STATE, ServiceState.STATE_IN_SERVICE);
             if (ss != ServiceState.STATE_POWER_OFF
                     && getServiceState(context) == ServiceState.STATE_POWER_OFF) {
-                startConfigService();
+                startConfigServiceToEnableChannels();
             }
             setServiceState(ss);
         } else if (CELLBROADCAST_START_CONFIG_ACTION.equals(action)
                 || SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.equals(action)) {
-            startConfigService();
+            startConfigServiceToEnableChannels();
         } else if (Telephony.Sms.Intents.ACTION_SMS_EMERGENCY_CB_RECEIVED.equals(action) ||
                 Telephony.Sms.Intents.SMS_CB_RECEIVED_ACTION.equals(action)) {
             intent.setClass(mContext, CellBroadcastAlertService.class);
@@ -161,12 +185,101 @@
                         .sendBroadcast(new Intent(ACTION_TESTING_MODE_CHANGED));
                 log(msg);
             }
+        } else if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
+            new CellBroadcastContentProvider.AsyncCellBroadcastTask(
+                    mContext.getContentResolver()).execute((CellBroadcastContentProvider
+                    .CellBroadcastOperation) provider -> {
+                        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);
         }
     }
 
     /**
+     * Send an intent to reset the users WEA settings if there is a new carrier on the default subId
+     *
+     * Do nothing in other cases:
+     *   - SIM insertion for the non-default subId
+     *   - SIM insertion/bootup with no new carrier
+     *   - SIM removal
+     *   - Device just received the update which adds this carrier tracking logic
+     * @param context the context
+     * @param subId subId of the carrier config event
+     */
+    private void resetSettingsIfCarrierChanged(Context context, int subId) {
+        // subId may be -1 if carrier config broadcast is being sent on SIM removal
+        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            if (getPreviousCarrierIdForDefaultSub() == NO_PREVIOUS_CARRIER_ID) {
+                // on first boot only, if no SIM is inserted we save the carrier ID -1.
+                // This allows us to detect the carrier change from -1 to the carrier of the first
+                // SIM when it is inserted.
+                saveCarrierIdForDefaultSub(TelephonyManager.UNKNOWN_CARRIER_ID);
+            }
+            Log.d(TAG, "ignoring carrier config broadcast because subId=-1");
+            return;
+        }
+
+        final int defaultSubId = SubscriptionManager.getDefaultSubscriptionId();
+        Log.d(TAG, "subId=" + subId + " defaultSubId=" + defaultSubId);
+        if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            Log.d(TAG, "ignoring carrier config broadcast because defaultSubId=-1");
+            return;
+        }
+
+        if (subId != defaultSubId) {
+            Log.d(TAG, "ignoring carrier config broadcast for subId=" + subId
+                    + " because it does not match defaultSubId=" + defaultSubId);
+            return;
+        }
+
+        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
+        // carrierId is loaded before carrier config, so this should be safe
+        int carrierId = tm.createForSubscriptionId(subId).getSimCarrierId();
+        if (carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) {
+            Log.e(TAG, "ignoring unknown carrier ID");
+            return;
+        }
+
+        int previousCarrierId = getPreviousCarrierIdForDefaultSub();
+        if (previousCarrierId == NO_PREVIOUS_CARRIER_ID) {
+            // on first boot if a SIM is inserted, assume it is not new and don't apply settings
+            Log.d(TAG, "ignoring carrier config broadcast for subId=" + subId
+                    + " for first boot");
+            saveCarrierIdForDefaultSub(carrierId);
+            return;
+        }
+
+        if (carrierId != previousCarrierId) {
+            saveCarrierIdForDefaultSub(carrierId);
+            startConfigService(context,
+                    CellBroadcastConfigService.ACTION_UPDATE_SETTINGS_FOR_CARRIER);
+        } else {
+            Log.d(TAG, "ignoring carrier config broadcast for subId=" + subId
+                    + " because carrier has not changed. carrierId=" + carrierId);
+        }
+    }
+
+    private int getPreviousCarrierIdForDefaultSub() {
+        return getDefaultSharedPreferences()
+                .getInt(CARRIER_ID_FOR_DEFAULT_SUB_PREF, NO_PREVIOUS_CARRIER_ID);
+    }
+
+    private void saveCarrierIdForDefaultSub(int carrierId) {
+        getDefaultSharedPreferences().edit().putInt(CARRIER_ID_FOR_DEFAULT_SUB_PREF, carrierId)
+                .apply();
+    }
+
+        /**
      * Enable/disable cell broadcast receiver testing mode.
      *
      * @param on {@code true} if testing mode is on, otherwise off.
@@ -213,9 +326,8 @@
         String currentIntervalDefault = sp.getString(CURRENT_INTERVAL_DEFAULT, "0");
 
         // If interval default changes, reset the interval to the new default value.
-        String newIntervalDefault = CellBroadcastSettings.getResources(mContext,
-                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID).getString(
-                        R.string.alert_reminder_interval_in_min_default);
+        String newIntervalDefault = CellBroadcastSettings.getResourcesForDefaultSubId(mContext)
+                .getString(R.string.alert_reminder_interval_in_min_default);
         if (!newIntervalDefault.equals(currentIntervalDefault)) {
             Log.d(TAG, "Default interval changed from " + currentIntervalDefault + " to " +
                     newIntervalDefault);
@@ -232,7 +344,7 @@
         }
     }
     /**
-     * This method's purpose if to enable unit testing
+     * This method's purpose is to enable unit testing
      * @return sharedePreferences for mContext
      */
     @VisibleForTesting
@@ -254,9 +366,12 @@
      * initialize shared preferences before starting services
      */
     @VisibleForTesting
-    public void initializeSharedPreference() {
+    public void initializeSharedPreference(Context context, int subId) {
         if (isSystemUser()) {
             Log.d(TAG, "initializeSharedPreference");
+
+            resetSettingsIfCarrierChanged(context, subId);
+
             SharedPreferences sp = getDefaultSharedPreferences();
 
             if (!sharedPrefsHaveDefaultValues()) {
@@ -276,7 +391,6 @@
                     sp.edit().putBoolean(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE,
                             false).apply();
                 }
-
             } else {
                 Log.d(TAG, "Skip setting default values of shared preference.");
             }
@@ -305,6 +419,7 @@
                 CellBroadcasts.Preference.ENABLE_ALERT_VIBRATION_PREF,
                 CellBroadcasts.Preference.ENABLE_CMAS_IN_SECOND_LANGUAGE_PREF,
                 ENABLE_ALERT_MASTER_PREF,
+                ALERT_REMINDER_INTERVAL_PREF
         };
         try (ContentProviderClient client = mContext.getContentResolver()
                 .acquireContentProviderClient(Telephony.CellBroadcasts.AUTHORITY_LEGACY)) {
@@ -321,9 +436,19 @@
                             CellBroadcasts.CALL_METHOD_GET_PREFERENCE,
                             key, null);
                     if (pref != null && pref.containsKey(key)) {
-                        Log.d(TAG, "migrateSharedPreferenceFromLegacy: " + key + "val: "
-                                + pref.getBoolean(key));
-                        sp.putBoolean(key, pref.getBoolean(key));
+                        Object val = pref.get(key);
+                        if (val == null) {
+                            // noop - no value to set.
+                            // Only support Boolean and String as preference types for now.
+                        } else if (val instanceof Boolean) {
+                            Log.d(TAG, "migrateSharedPreferenceFromLegacy: " + key + "val: "
+                                    + pref.getBoolean(key));
+                            sp.putBoolean(key, pref.getBoolean(key));
+                        } else if (val instanceof String) {
+                            Log.d(TAG, "migrateSharedPreferenceFromLegacy: " + key + "val: "
+                                    + pref.getString(key));
+                            sp.putString(key, pref.getString(key));
+                        }
                     } else {
                         Log.d(TAG, "migrateSharedPreferenceFromLegacy: unsupported key: " + key);
                     }
@@ -417,8 +542,7 @@
      * This method's purpose if to enable unit testing
      * @return if the mContext user is a system user
      */
-    @VisibleForTesting
-    public boolean isSystemUser() {
+    private boolean isSystemUser() {
         return isSystemUser(mContext);
     }
 
@@ -426,8 +550,8 @@
      * This method's purpose if to enable unit testing
      */
     @VisibleForTesting
-    public void startConfigService() {
-        startConfigService(mContext);
+    public void startConfigServiceToEnableChannels() {
+        startConfigService(mContext, CellBroadcastConfigService.ACTION_ENABLE_CHANNELS);
     }
 
     /**
@@ -444,12 +568,11 @@
      * Tell {@link CellBroadcastConfigService} to enable the CB channels.
      * @param context the broadcast receiver context
      */
-    static void startConfigService(Context context) {
+    static void startConfigService(Context context, String action) {
         if (isSystemUser(context)) {
-            Intent serviceIntent = new Intent(CellBroadcastConfigService.ACTION_ENABLE_CHANNELS,
-                    null, context, CellBroadcastConfigService.class);
-            Log.d(TAG, "Start Cell Broadcast configuration.");
-            context.startService(serviceIntent);
+            Log.d(TAG, "Start Cell Broadcast configuration for intent=" + action);
+            context.startService(new Intent(action, null, context,
+                    CellBroadcastConfigService.class));
         } else {
             Log.e(TAG, "startConfigService: Not system user.");
         }
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverApp.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverApp.java
index e91ee1e..368a879 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverApp.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiverApp.java
@@ -16,9 +16,11 @@
 
 package com.android.cellbroadcastreceiver;
 
+import android.annotation.NonNull;
 import android.app.Application;
 import android.telephony.SmsCbMessage;
 
+import android.util.Log;
 import java.util.ArrayList;
 
 /**
@@ -27,21 +29,39 @@
  */
 public class CellBroadcastReceiverApp extends Application {
     private static final String TAG = "CellBroadcastReceiverApp";
+    private static final boolean VDBG = Log.isLoggable(TAG, Log.VERBOSE);
 
     /** List of unread non-emergency alerts to show when user selects the notification. */
     private static final ArrayList<SmsCbMessage> sNewMessageList = new ArrayList<>(4);
 
     /** Adds a new unread non-emergency message and returns the current list. */
     static ArrayList<SmsCbMessage> addNewMessageToList(SmsCbMessage message) {
+        if (VDBG) Log.v(TAG, "addNewMessageToList: " + message);
         sNewMessageList.add(message);
         return sNewMessageList;
     }
 
     /** Clears the list of unread non-emergency messages. */
     static void clearNewMessageList() {
+        if (VDBG) Log.v(TAG, "clearNewMessageList");
         sNewMessageList.clear();
     }
 
+    /** Remove the read message from the unread message list. */
+    static ArrayList<SmsCbMessage> removeReadMessage(@NonNull SmsCbMessage message) {
+        if (sNewMessageList.removeIf(msg -> msg.getReceivedTime() == message.getReceivedTime())) {
+            if (VDBG) Log.v(TAG, "removeReadMessage succeed, msg: " + message);
+        } else {
+            if (VDBG) Log.v(TAG, "removeReadMessage failed, no matching message: " + message);
+        }
+        return sNewMessageList;
+    }
+
+    /** Returns the latest unread message. */
+    static SmsCbMessage getLatestMessage() {
+        return sNewMessageList.isEmpty() ? null : sNewMessageList.get(sNewMessageList.size()-1);
+    }
+
     /** Returns a list of unread non-emergency alerts */
     static ArrayList<SmsCbMessage> getNewMessageList() {
         return sNewMessageList;
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
index 23f4dd1..35d418d 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastResources.java
@@ -16,7 +16,9 @@
 
 package com.android.cellbroadcastreceiver;
 
+import android.annotation.NonNull;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Typeface;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbEtwsInfo;
@@ -30,6 +32,7 @@
 
 import java.text.DateFormat;
 import java.util.ArrayList;
+import java.util.Locale;
 
 /**
  * Returns the string resource ID's for CMAS and ETWS emergency alerts.
@@ -280,6 +283,51 @@
         }
     }
 
+    /**
+     * Return the English string for the SMS sender address.
+     * This exists as a temporary workaround for b/174972822
+     * @param context
+     * @param message
+     * @return
+     */
+    public static String getSmsSenderAddressResourceEnglishString(@NonNull Context context,
+            @NonNull SmsCbMessage message) {
+
+        int resId = getSmsSenderAddressResource(context, message);
+
+        Configuration conf = context.getResources().getConfiguration();
+        conf = new Configuration(conf);
+        conf.setLocale(Locale.ENGLISH);
+        Context localizedContext = context.createConfigurationContext(conf);
+        return localizedContext.getResources().getText(resId).toString();
+    }
+
+    /**
+     * @return the string resource ID for the SMS sender address.
+     * As a temporary workaround for b/174972822, prefer getSmsSenderAddressResourceEnglishString,
+     * which ignores all translations for non-English languages for these 4 strings.
+     */
+    public static int getSmsSenderAddressResource(@NonNull Context context,
+            @NonNull SmsCbMessage message) {
+        CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
+                context, message.getSubscriptionId());
+        final int serviceCategory = message.getServiceCategory();
+        // store to different SMS threads based on channel mappings.
+        if (channelManager.checkCellBroadcastChannelRange(serviceCategory,
+                R.array.cmas_presidential_alerts_channels_range_strings)) {
+            return R.string.sms_cb_sender_name_presidential;
+        }
+        if (channelManager.checkCellBroadcastChannelRange(serviceCategory,
+                R.array.emergency_alerts_channels_range_strings)) {
+            return R.string.sms_cb_sender_name_emergency;
+        }
+        if (channelManager.checkCellBroadcastChannelRange(serviceCategory,
+                R.array.public_safety_messages_channels_range_strings)) {
+            return R.string.sms_cb_sender_name_public_safety;
+        }
+        return R.string.sms_cb_sender_name_default;
+    }
+
     static int getDialogTitleResource(Context context, SmsCbMessage message) {
         // ETWS warning types
         SmsCbEtwsInfo etwsInfo = message.getEtwsWarningInfo();
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
index 16dbc26..c1cfba5 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
@@ -82,14 +82,13 @@
     }
 
     /**
-     * this method is to make this class unit-testable, because CellBroadcastSettings.getResources()
-     * is a static method and cannot be stubbed.
+     * this method is to make this class unit-testable, because
+     * CellBroadcastSettings.getResourcesForDefaultSubId() is a static method and cannot be stubbed.
      * @return resources
      */
     @VisibleForTesting
     public Resources getResourcesMethod() {
-        return CellBroadcastSettings.getResources(getContextMethod(),
-                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+        return CellBroadcastSettings.getResourcesForDefaultSubId(getContextMethod());
     }
 
     /**
@@ -113,6 +112,10 @@
             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++) {
@@ -135,6 +138,10 @@
             return null;
         }
 
+        if (isDisableAllCbMessages()) {
+            return null;
+        }
+
         MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
         final Resources res = getResourcesMethod();
 
@@ -185,6 +192,15 @@
             cursor.addRow(ref);
         }
 
+        if (!CellBroadcastSettings.getResources(getContextMethod(),
+                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID)
+                .getBoolean(R.bool.show_alert_speech_setting)) {
+            ref = new Object[1];
+            ref[COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE] =
+                    CellBroadcastSettings.KEY_ENABLE_ALERT_SPEECH;
+            cursor.addRow(ref);
+        }
+
         if (!res.getBoolean(R.bool.show_extreme_alert_settings)) {
             // Remove CMAS preference items in emergency alert category.
             ref = new Object[1];
@@ -274,4 +290,21 @@
         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 cca47d6..c8eb500 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -18,7 +18,7 @@
 
 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;
 import android.content.BroadcastReceiver;
@@ -31,10 +31,13 @@
 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.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.MenuItem;
+import android.widget.Switch;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.ListPreference;
@@ -46,6 +49,10 @@
 import androidx.preference.TwoStatePreference;
 
 import com.android.internal.annotations.VisibleForTesting;
+import com.android.modules.utils.build.SdkLevel;
+import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
+import com.android.settingslib.widget.MainSwitchPreference;
+import com.android.settingslib.widget.OnMainSwitchChangeListener;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -53,12 +60,16 @@
 /**
  * Settings activity for the cell broadcast receiver.
  */
-public class CellBroadcastSettings extends Activity {
+public class CellBroadcastSettings extends CollapsingToolbarBaseActivity {
 
     private static final String TAG = "CellBroadcastSettings";
 
     private static final boolean DBG = false;
 
+    /**
+     * Keys for user preferences.
+     * When adding a new preference, make sure to clear its value in resetAllPreferences.
+     */
     // Preference key for alert header (A text view, not clickable).
     public static final String KEY_ALERTS_HEADER = "alerts_header";
 
@@ -68,12 +79,21 @@
     // 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 main volume is silent).
     public static final String KEY_ENABLE_ALERT_VIBRATE = "enable_alert_vibrate";
 
+    // Speak contents of alert after playing the alert sound.
+    public static final String KEY_ENABLE_ALERT_SPEECH = "enable_alert_speech";
+
     // Play alert sound in full volume regardless Do Not Disturb is on.
     public static final String KEY_OVERRIDE_DND = "override_dnd";
 
@@ -105,6 +125,12 @@
     // Whether to display monthly test messages (default is disabled).
     public static final String KEY_ENABLE_TEST_ALERTS = "enable_test_alerts";
 
+    // Whether to display exercise test alerts.
+    public static final String KEY_ENABLE_EXERCISE_ALERTS = "enable_exercise_alerts";
+
+    // Whether to display operator defined test alerts
+    public static final String KEY_OPERATOR_DEFINED_ALERTS = "enable_operator_defined_alerts";
+
     // Whether to display state/local test messages (default disabled).
     public static final String KEY_ENABLE_STATE_LOCAL_TEST_ALERTS =
             "enable_state_local_test_alerts";
@@ -126,24 +152,49 @@
     // For watch layout
     private static final String KEY_WATCH_ALERT_REMINDER = "watch_alert_reminder";
 
-    // Resource cache
-    private static final Map<Integer, Resources> sResourcesCache = new HashMap<>();
-
-    // Test override for disabling the subId specific resources
-    private static boolean sUseResourcesForSubId = true;
-
     // Whether to receive alert in second language code
     public static final String KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE =
             "receive_cmas_in_second_language";
 
+    /* End of user preferences keys section. */
+
+    // Resource cache
+    private static final Map<Integer, Resources> sResourcesCache = new HashMap<>();
+
+    // Intent sent from cellbroadcastreceiver to notify cellbroadcastservice that area info update
+    // is disabled/enabled.
+    private static final String AREA_INFO_UPDATE_ACTION =
+            "com.android.cellbroadcastreceiver.action.AREA_UPDATE_INFO_ENABLED";
+    private static final String AREA_INFO_UPDATE_ENABLED_EXTRA = "enable";
+
+    /**
+     * This permission is only granted to the cellbroadcast mainline module and thus can be
+     * used for permission check within CBR and CBS.
+     */
+    private static final String CBR_MODULE_PERMISSION =
+            "com.android.cellbroadcastservice.FULL_ACCESS_CELL_BROADCAST_HISTORY";
+
+    // Key for shared preference which represents whether user has changed any preference
+    private static final String ANY_PREFERENCE_CHANGED_BY_USER = "any_preference_changed_by_user";
+
+    // Test override for disabling the subId specific resources
+    private static boolean sUseResourcesForSubId = true;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
+        // for backward compatibility on R devices
+        if (!SdkLevel.isAtLeastS()) {
+            setCustomizeContentView(R.layout.cell_broadcast_list_collapsing_no_toobar);
+        }
         super.onCreate(savedInstanceState);
 
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null) {
-            // android.R.id.home will be triggered in onOptionsItemSelected()
-            actionBar.setDisplayHomeAsUpEnabled(true);
+        // for backward compatibility on R devices
+        if (!SdkLevel.isAtLeastS()) {
+            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);
@@ -153,12 +204,13 @@
         }
 
         // 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();
         }
     }
@@ -183,6 +235,65 @@
     }
 
     /**
+     * Reset all user values for preferences (stored in shared preferences).
+     *
+     * @param c the application context
+     */
+    public static void resetAllPreferences(Context c) {
+        SharedPreferences.Editor e = PreferenceManager.getDefaultSharedPreferences(c).edit();
+        e.remove(KEY_ENABLE_CMAS_EXTREME_THREAT_ALERTS)
+                .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)
+                .remove(KEY_OVERRIDE_DND)
+                .remove(KEY_ENABLE_AREA_UPDATE_INFO_ALERTS)
+                .remove(KEY_ENABLE_TEST_ALERTS)
+                .remove(KEY_ENABLE_STATE_LOCAL_TEST_ALERTS)
+                .remove(KEY_ENABLE_ALERT_VIBRATE)
+                .remove(KEY_ENABLE_CMAS_PRESIDENTIAL_ALERTS)
+                .remove(KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE)
+                .remove(KEY_ENABLE_EXERCISE_ALERTS)
+                .remove(KEY_OPERATOR_DEFINED_ALERTS);
+        // If the device is in test harness mode, reset main toggle should only happen on the
+        // first boot.
+        if (!ActivityManager.isRunningInUserTestHarness()) {
+          Log.d(TAG, "In not test harness mode. reset main toggle.");
+          e.remove(KEY_ENABLE_ALERTS_MASTER_TOGGLE);
+        }
+        PackageManager pm = c.getPackageManager();
+        if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+            e.remove(KEY_WATCH_ALERT_REMINDER);
+        }
+        e.commit();
+
+        if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+            PreferenceManager.setDefaultValues(c, R.xml.watch_preferences, true);
+        } else {
+            PreferenceManager.setDefaultValues(c, R.xml.preferences, true);
+        }
+        setPreferenceChanged(c, false);
+    }
+
+    /**
+     * Return true if user has modified any preference manually.
+     * @param c the application context
+     * @return
+     */
+    public static boolean hasAnyPreferenceChanged(Context c) {
+        return PreferenceManager.getDefaultSharedPreferences(c)
+                .getBoolean(ANY_PREFERENCE_CHANGED_BY_USER, false);
+    }
+
+    private static void setPreferenceChanged(Context c, boolean changed) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(c);
+        sp.edit().putBoolean(ANY_PREFERENCE_CHANGED_BY_USER, changed).apply();
+    }
+
+    /**
      * New fragment-style implementation of preferences.
      */
     public static class CellBroadcastSettingsFragment extends PreferenceFragment {
@@ -190,13 +301,17 @@
         private TwoStatePreference mExtremeCheckBox;
         private TwoStatePreference mSevereCheckBox;
         private TwoStatePreference mAmberCheckBox;
-        private TwoStatePreference mMasterToggle;
+        private MainSwitchPreference mMasterToggle;
         private TwoStatePreference mPublicSafetyMessagesChannelCheckBox;
+        private TwoStatePreference mPublicSafetyMessagesChannelFullScreenCheckBox;
         private TwoStatePreference mEmergencyAlertsCheckBox;
         private ListPreference mReminderInterval;
+        private TwoStatePreference mSpeechCheckBox;
         private TwoStatePreference mOverrideDndCheckBox;
         private TwoStatePreference mAreaUpdateInfoCheckBox;
         private TwoStatePreference mTestCheckBox;
+        private TwoStatePreference mExerciseTestCheckBox;
+        private TwoStatePreference mOperatorDefinedCheckBox;
         private TwoStatePreference mStateLocalTestCheckBox;
         private TwoStatePreference mEnableVibrateCheckBox;
         private Preference mAlertHistory;
@@ -214,7 +329,7 @@
         // on/off switch in settings for receiving alert in second language code
         private TwoStatePreference mReceiveCmasInSecondLanguageCheckBox;
 
-        private final BroadcastReceiver mTestingModeChangedReeiver = new BroadcastReceiver() {
+        private final BroadcastReceiver mTestingModeChangedReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
                 switch (intent.getAction()) {
@@ -225,43 +340,34 @@
             }
         };
 
-        @Override
-        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-
-            LocalBroadcastManager.getInstance(getContext())
-                    .registerReceiver(mTestingModeChangedReeiver, new IntentFilter(
-                            CellBroadcastReceiver.ACTION_TESTING_MODE_CHANGED));
-
-            // Load the preferences from an XML resource
-            PackageManager pm = getActivity().getPackageManager();
-            if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
-                addPreferencesFromResource(R.xml.watch_preferences);
-            } else {
-                addPreferencesFromResource(R.xml.preferences);
-            }
-
-            PreferenceScreen preferenceScreen = getPreferenceScreen();
-
+        private void initPreferences() {
             mExtremeCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_CMAS_EXTREME_THREAT_ALERTS);
             mSevereCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_CMAS_SEVERE_THREAT_ALERTS);
             mAmberCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_CMAS_AMBER_ALERTS);
-            mMasterToggle = (TwoStatePreference)
+            mMasterToggle = (MainSwitchPreference)
                     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)
                     findPreference(KEY_ALERT_REMINDER_INTERVAL);
+            mSpeechCheckBox = (TwoStatePreference)
+                    findPreference(KEY_ENABLE_ALERT_SPEECH);
             mOverrideDndCheckBox = (TwoStatePreference)
                     findPreference(KEY_OVERRIDE_DND);
             mAreaUpdateInfoCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_AREA_UPDATE_INFO_ALERTS);
             mTestCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_TEST_ALERTS);
+            mExerciseTestCheckBox = (TwoStatePreference) findPreference(KEY_ENABLE_EXERCISE_ALERTS);
+            mOperatorDefinedCheckBox = (TwoStatePreference)
+                    findPreference(KEY_OPERATOR_DEFINED_ALERTS);
             mStateLocalTestCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_STATE_LOCAL_TEST_ALERTS);
             mAlertHistory = findPreference(KEY_EMERGENCY_ALERT_HISTORY);
@@ -274,6 +380,7 @@
             mPresidentialCheckBox = (TwoStatePreference)
                     findPreference(KEY_ENABLE_CMAS_PRESIDENTIAL_ALERTS);
 
+            PackageManager pm = getActivity().getPackageManager();
             if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
                 mAlertReminder = (TwoStatePreference)
                         findPreference(KEY_WATCH_ALERT_REMINDER);
@@ -300,20 +407,45 @@
                 mAlertCategory = (PreferenceCategory)
                         findPreference(KEY_CATEGORY_EMERGENCY_ALERTS);
             }
+        }
 
-            Resources res = CellBroadcastSettings.getResources(getContext(),
-                    SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+        @Override
+        public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
-            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
+            LocalBroadcastManager.getInstance(getContext())
+                    .registerReceiver(mTestingModeChangedReceiver, new IntentFilter(
+                            CellBroadcastReceiver.ACTION_TESTING_MODE_CHANGED));
+
+            // Load the preferences from an XML resource
+            PackageManager pm = getActivity().getPackageManager();
+            if (pm.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+                addPreferencesFromResource(R.xml.watch_preferences);
+            } else {
+                addPreferencesFromResource(R.xml.preferences);
+            }
+
+            initPreferences();
+
+            Resources res = CellBroadcastSettings.getResourcesForDefaultSubId(getContext());
+
             mDisableSevereWhenExtremeDisabled = res.getBoolean(
                     R.bool.disable_severe_when_extreme_disabled);
 
+            final OnMainSwitchChangeListener mainSwitchListener = new OnMainSwitchChangeListener() {
+                @Override
+                public void onSwitchChanged(Switch switchView, boolean isChecked) {
+                    setAlertsEnabled(isChecked);
+                }
+            };
+
             // Handler for settings that require us to reconfigure enabled channels in radio
             Preference.OnPreferenceChangeListener startConfigServiceListener =
                     new Preference.OnPreferenceChangeListener() {
                         @Override
                         public boolean onPreferenceChange(Preference pref, Object newValue) {
-                            CellBroadcastReceiver.startConfigService(pref.getContext());
+                            CellBroadcastReceiver.startConfigService(pref.getContext(),
+                                    CellBroadcastConfigService.ACTION_ENABLE_CHANNELS);
+                            setPreferenceChanged(getContext(), true);
 
                             if (mDisableSevereWhenExtremeDisabled) {
                                 if (pref.getKey().equals(KEY_ENABLE_CMAS_EXTREME_THREAT_ALERTS)) {
@@ -325,9 +457,10 @@
                                 }
                             }
 
-                            if (pref.getKey().equals(KEY_ENABLE_ALERTS_MASTER_TOGGLE)) {
-                                boolean isEnableAlerts = (Boolean) newValue;
-                                setAlertsEnabled(isEnableAlerts);
+                            // check if area update was disabled
+                            if (pref.getKey().equals(KEY_ENABLE_AREA_UPDATE_INFO_ALERTS)) {
+                                boolean isEnabledAlert = (Boolean) newValue;
+                                notifyAreaInfoUpdate(isEnabledAlert);
                             }
 
                             // Notify backup manager a backup pass is needed.
@@ -339,14 +472,15 @@
             initReminderIntervalList();
 
             if (mMasterToggle != null) {
-                mMasterToggle.setOnPreferenceChangeListener(startConfigServiceListener);
+                mMasterToggle.addOnSwitchChangeListener(mainSwitchListener);
                 // If allow alerts are disabled, we turn all sub-alerts off. If it's enabled, we
                 // leave them as they are.
                 if (!mMasterToggle.isChecked()) {
                     setAlertsEnabled(false);
                 }
             }
-
+            // note that mPresidentialCheckBox does not use the startConfigServiceListener because
+            // the user is never allowed to change the preference
             if (mAreaUpdateInfoCheckBox != null) {
                 mAreaUpdateInfoCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
             }
@@ -357,6 +491,10 @@
                 mPublicSafetyMessagesChannelCheckBox.setOnPreferenceChangeListener(
                         startConfigServiceListener);
             }
+            if (mPublicSafetyMessagesChannelFullScreenCheckBox != null) {
+                mPublicSafetyMessagesChannelFullScreenCheckBox.setOnPreferenceChangeListener(
+                        startConfigServiceListener);
+            }
             if (mEmergencyAlertsCheckBox != null) {
                 mEmergencyAlertsCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
             }
@@ -374,11 +512,19 @@
             if (mTestCheckBox != null) {
                 mTestCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
             }
+            if (mExerciseTestCheckBox != null) {
+                mExerciseTestCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
+            }
+            if (mOperatorDefinedCheckBox != null) {
+                mOperatorDefinedCheckBox.setOnPreferenceChangeListener(startConfigServiceListener);
+            }
             if (mStateLocalTestCheckBox != null) {
                 mStateLocalTestCheckBox.setOnPreferenceChangeListener(
                         startConfigServiceListener);
             }
 
+            SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
+
             if (mOverrideDndCheckBox != null) {
                 if (!sp.getBoolean(KEY_OVERRIDE_DND_SETTINGS_CHANGED, false)) {
                     // If the user hasn't changed this settings yet, use the default settings
@@ -431,11 +577,14 @@
          * Dynamically update each preference's visibility based on configuration.
          */
         private void updatePreferenceVisibility() {
-            Resources res = CellBroadcastSettings.getResources(getContext(),
-                    SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+            Resources res = CellBroadcastSettings.getResourcesForDefaultSubId(getContext());
 
             CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(
-                    getContext(), SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+                    getContext(), SubscriptionManager.getDefaultSubscriptionId());
+
+            if (mMasterToggle != null) {
+                mMasterToggle.setVisible(res.getBoolean(R.bool.show_main_switch_settings));
+            }
 
             if (mPresidentialCheckBox != null) {
                 mPresidentialCheckBox.setVisible(
@@ -467,11 +616,47 @@
                                         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()));
             }
 
+            if (mExerciseTestCheckBox != null) {
+                boolean visible = false;
+                if (res.getBoolean(R.bool.show_separate_exercise_settings)) {
+                    if (res.getBoolean(R.bool.show_exercise_settings)
+                            || CellBroadcastReceiver.isTestingMode(getContext())) {
+                        if (!channelManager.getCellBroadcastChannelRanges(
+                                R.array.exercise_alert_range_strings).isEmpty()) {
+                            visible = true;
+                        }
+                    }
+                }
+                mExerciseTestCheckBox.setVisible(visible);
+            }
+
+            if (mOperatorDefinedCheckBox != null) {
+                boolean visible = false;
+                if (res.getBoolean(R.bool.show_separate_operator_defined_settings)) {
+                    if (res.getBoolean(R.bool.show_operator_defined_settings)
+                            || CellBroadcastReceiver.isTestingMode(getContext())) {
+                        if (!channelManager.getCellBroadcastChannelRanges(
+                                R.array.operator_defined_alert_range_strings).isEmpty()) {
+                            visible = true;
+                        }
+                    }
+                }
+                mOperatorDefinedCheckBox.setVisible(visible);
+            }
+
             if (mEmergencyAlertsCheckBox != null) {
                 mEmergencyAlertsCheckBox.setVisible(!channelManager.getCellBroadcastChannelRanges(
                         R.array.emergency_alerts_channels_range_strings).isEmpty());
@@ -503,19 +688,26 @@
                 // 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_override_dnd_settings)
-                                || !res.getBoolean(R.bool.override_dnd_default));
+                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)));
             }
             if (mAlertsHeader != null) {
                 mAlertsHeader.setVisible(
                         !getContext().getString(R.string.alerts_header_summary).isEmpty());
             }
+
+            if (mSpeechCheckBox != null) {
+                mSpeechCheckBox.setVisible(res.getBoolean(R.bool.show_alert_speech_setting)
+                        || getActivity().getPackageManager()
+                        .hasSystemFeature(PackageManager.FEATURE_WATCH));
+            }
         }
 
         private void initReminderIntervalList() {
-            Resources res = CellBroadcastSettings.getResources(
-                    getContext(), SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+            Resources res = CellBroadcastSettings.getResourcesForDefaultSubId(getContext());
 
             String[] activeValues =
                     res.getStringArray(R.array.alert_reminder_interval_active_values);
@@ -565,9 +757,7 @@
             if (mAreaUpdateInfoCheckBox != null) {
                 mAreaUpdateInfoCheckBox.setEnabled(alertsEnabled);
                 mAreaUpdateInfoCheckBox.setChecked(alertsEnabled);
-            }
-            if (mAlertPreferencesCategory != null) {
-                mAlertPreferencesCategory.setEnabled(alertsEnabled);
+                notifyAreaInfoUpdate(alertsEnabled);
             }
             if (mEmergencyAlertsCheckBox != null) {
                 mEmergencyAlertsCheckBox.setEnabled(alertsEnabled);
@@ -585,8 +775,25 @@
                 mTestCheckBox.setEnabled(alertsEnabled);
                 mTestCheckBox.setChecked(alertsEnabled);
             }
+            if (mExerciseTestCheckBox != null) {
+                mExerciseTestCheckBox.setEnabled(alertsEnabled);
+                mExerciseTestCheckBox.setChecked(alertsEnabled);
+            }
+            if (mOperatorDefinedCheckBox != null) {
+                mOperatorDefinedCheckBox.setEnabled(alertsEnabled);
+                mOperatorDefinedCheckBox.setChecked(alertsEnabled);
+            }
         }
 
+        private void notifyAreaInfoUpdate(boolean enabled) {
+            Intent areaInfoIntent = new Intent(AREA_INFO_UPDATE_ACTION);
+            areaInfoIntent.putExtra(AREA_INFO_UPDATE_ENABLED_EXTRA, enabled);
+            // sending broadcast protected by the permission which is only
+            // granted for CBR mainline module.
+            getContext().sendBroadcast(areaInfoIntent, CBR_MODULE_PERMISSION);
+        }
+
+
         @Override
         public void onResume() {
             super.onResume();
@@ -597,21 +804,24 @@
         public void onDestroy() {
             super.onDestroy();
             LocalBroadcastManager.getInstance(getContext())
-                    .unregisterReceiver(mTestingModeChangedReeiver);
+                    .unregisterReceiver(mTestingModeChangedReceiver);
         }
     }
 
     public static boolean isTestAlertsToggleVisible(Context context) {
         CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(context,
-                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
-        Resources res = CellBroadcastSettings.getResources(context,
-                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+                SubscriptionManager.getDefaultSubscriptionId());
+        Resources res = CellBroadcastSettings.getResourcesForDefaultSubId(context);
         boolean isTestAlertsAvailable = !channelManager.getCellBroadcastChannelRanges(
                 R.array.required_monthly_test_range_strings).isEmpty()
-                || !channelManager.getCellBroadcastChannelRanges(
+                || (!channelManager.getCellBroadcastChannelRanges(
                 R.array.exercise_alert_range_strings).isEmpty()
-                || !channelManager.getCellBroadcastChannelRanges(
+                /** exercise toggle is controlled under the main test toggle */
+                && (!res.getBoolean(R.bool.show_separate_exercise_settings)))
+                || (!channelManager.getCellBroadcastChannelRanges(
                 R.array.operator_defined_alert_range_strings).isEmpty()
+                /** operator defined toggle is controlled under the main test toggle */
+                && (!res.getBoolean(R.bool.show_separate_operator_defined_settings)))
                 || !channelManager.getCellBroadcastChannelRanges(
                 R.array.etws_test_alerts_range_strings).isEmpty();
 
@@ -653,8 +863,14 @@
      * @return The resource
      */
     public static @NonNull Resources getResources(@NonNull Context context, int subId) {
+        // based on the latest design, subId can be valid earlier than mcc mnc is known to telephony
+        // check if sim is loaded to avoid caching the wrong resources.
+        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
+        boolean isSimLoaded = tm.getSimApplicationState(SubscriptionManager.getSlotIndex(subId))
+                == TelephonyManager.SIM_STATE_LOADED;
         if (subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID
-                || !SubscriptionManager.isValidSubscriptionId(subId) || !sUseResourcesForSubId) {
+                || !SubscriptionManager.isValidSubscriptionId(subId) || !sUseResourcesForSubId
+                || !isSimLoaded) {
             return context.getResources();
         }
 
@@ -667,4 +883,14 @@
 
         return res;
     }
+
+    /**
+     * Get the resources using the default subscription ID.
+     * @param context Context
+     * @return the Resources for the default subscription ID, or if there is no default subscription
+     * from SubscriptionManager, the resources for the latest loaded SIM.
+     */
+    public static @NonNull Resources getResourcesForDefaultSubId(@NonNull Context context) {
+        return getResources(context, SubscriptionManager.getDefaultSubscriptionId());
+    }
 }
diff --git a/src/com/android/cellbroadcastreceiver/CustomHeightScrollView.java b/src/com/android/cellbroadcastreceiver/CustomHeightScrollView.java
new file mode 100644
index 0000000..255d5aa
--- /dev/null
+++ b/src/com/android/cellbroadcastreceiver/CustomHeightScrollView.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cellbroadcastreceiver;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.ScrollView;
+
+/**
+ * Custom scroll view to display text with a max height inside a {@link CellBroadcastAlertDialog}
+ */
+public class CustomHeightScrollView extends ScrollView {
+    private int mMaximumHeight = 0;
+
+    public CustomHeightScrollView(Context context) {
+        super(context);
+    }
+
+    public CustomHeightScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CustomHeightScrollView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    public void setMaximumHeight(int height) {
+        mMaximumHeight = height;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+        if (mMaximumHeight > 0) {
+            int measuredHeight = getMeasuredHeight();
+            if (getLayoutParams().height != LayoutParams.MATCH_PARENT) {
+                if (measuredHeight > mMaximumHeight) {
+                    setMeasuredDimension(getMeasuredWidth(), mMaximumHeight);
+                    return;
+                }
+            }
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}
+
diff --git a/tests/testapp/AndroidManifest.xml b/tests/testapp/AndroidManifest.xml
index 6234985..f71f258 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 5af4046..27d4f24 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -66,7 +66,12 @@
         "androidx.preference_preference",
         "androidx.appcompat_appcompat",
         "androidx.legacy_legacy-preference-v14",
+        "SettingsLibSettingsTheme",
+        "SettingsLibCollapsingToolbarBaseActivity",
+        "SettingsLibMainSwitchPreference",
+        "modules-utils-build_system",
     ],
+    min_sdk_version: "30",
 }
 
 
diff --git a/tests/unit/AndroidManifest_OemTesting.xml b/tests/unit/AndroidManifest_OemTesting.xml
index 57290f1..e3ae78c 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 9af8a7d..8cb5c46 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastActivityTestCase.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastActivityTestCase.java
@@ -21,11 +21,14 @@
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
+import android.os.Handler;
 import android.test.ActivityUnitTestCase;
 import android.util.Log;
 import android.view.Display;
 
 import java.util.HashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class CellBroadcastActivityTestCase<T extends Activity> extends ActivityUnitTestCase<T> {
 
@@ -59,8 +62,13 @@
         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) {
@@ -79,6 +87,17 @@
         mContext.injectSystemService(cls, service);
     }
 
+    protected final void waitForHandlerAction(Handler h, long timeoutMillis) {
+        final CountDownLatch lock = new CountDownLatch(1);
+        h.post(lock::countDown);
+        while (lock.getCount() > 0) {
+            try {
+                lock.await(timeoutMillis, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException e) {
+                // do nothing
+            }
+        }
+    }
     public static class TestContext extends ContextWrapper {
 
         private static final String TAG = TestContext.class.getSimpleName();
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertAudioTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertAudioTest.java
index 40d82ce..37f73dd 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertAudioTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertAudioTest.java
@@ -34,6 +34,7 @@
 import android.telephony.TelephonyManager;
 
 import com.android.cellbroadcastreceiver.CellBroadcastAlertAudio;
+import com.android.cellbroadcastreceiver.CellBroadcastSettings;
 
 import org.junit.After;
 import org.junit.Before;
@@ -101,7 +102,7 @@
         MockitoAnnotations.initMocks(this);
         doReturn(mConfiguration).when(mResources).getConfiguration();
         doReturn(mDevices).when(mMockedAudioManager).getDevices(anyInt());
-
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERT_VIBRATE);
     }
 
     @After
@@ -164,7 +165,7 @@
         verify(mMockedAudioManager).getRingerMode();
         verify(mMockedVibrator).vibrate(any(), any());
         verify(mMockedTelephonyManager, atLeastOnce()).getCallState();
-        verify(mMockedAudioManager).requestAudioFocus(any(), anyInt(), anyInt());
+        verify(mMockedAudioManager).requestAudioFocus(any(), any(), anyInt(), anyInt());
         verify(mMockedAudioManager).getDevices(anyInt());
         verify(mMockedAudioManager).setStreamVolume(anyInt(), eq(TEST_MAX_VOLUME), anyInt());
         phoneStateListenerHandler.quit();
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertDialogTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertDialogTest.java
index d892b02..a30c9c4 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertDialogTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertDialogTest.java
@@ -27,22 +27,24 @@
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Intent;
-import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IPowerManager;
 import android.os.IThermalService;
 import android.os.Looper;
 import android.os.Message;
 import android.os.PowerManager;
-import android.preference.PreferenceManager;
 import android.telephony.SmsCbMessage;
 import android.view.KeyEvent;
-import android.view.WindowManager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.android.cellbroadcastreceiver.CellBroadcastAlertDialog;
 import com.android.cellbroadcastreceiver.CellBroadcastAlertService;
 import com.android.cellbroadcastreceiver.CellBroadcastSettings;
+import com.android.cellbroadcastreceiver.R;
 import com.android.internal.telephony.gsm.SmsCbConstants;
 
 import org.junit.After;
@@ -109,6 +111,7 @@
         mPowerManager = new PowerManager(mContext, mMockedPowerManagerService,
                 mMockedThermalService, null);
         injectSystemService(PowerManager.class, mPowerManager);
+        CellBroadcastSettings.setUseResourcesForSubId(false);
     }
 
     @After
@@ -182,37 +185,9 @@
                 eq(CellBroadcastAlertService.NOTIFICATION_ID));
     }
 
-    @InstrumentationTest
-    // This test has a module dependency (it uses the CellBroadcastContentProvider), so it is
-    // disabled for OEM testing because it is not a true unit test
-    public void testDismissWithDialog() throws Throwable {
-        // in order to trigger mShowOptOutDialog=true, the message should not be a presidential
-        // alert (the default message we send in this test)
-        mServiceCategory = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_CHILD_ABDUCTION_EMERGENCY;
-        mCmasMessageClass = SmsCbConstants.MESSAGE_ID_CMAS_ALERT_CHILD_ABDUCTION_EMERGENCY;
-
-        // prepare the looper so we can create opt out dialog
-        Looper.prepare();
-
-        // enable opt out dialog in shared prefs
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        prefs.edit().putBoolean(CellBroadcastSettings.KEY_SHOW_CMAS_OPT_OUT_DIALOG, true).apply();
-
-        boolean triedToCreateDialog = false;
-        try {
-            CellBroadcastAlertDialog activity = startActivity();
-            waitForMs(100);
-            activity.dismiss();
-        } catch (WindowManager.BadTokenException e) {
-            triedToCreateDialog = true;
-        }
-
-        assertTrue(triedToCreateDialog);
-    }
-
     public void testOnNewIntent() throws Throwable {
         Intent intent = createActivityIntent();
-        intent.putExtra(CellBroadcastAlertDialog.FROM_NOTIFICATION_EXTRA, true);
+        intent.putExtra(CellBroadcastAlertDialog.DISMISS_NOTIFICATION_EXTRA, true);
 
         Looper.prepare();
         CellBroadcastAlertDialog activity = startActivity(intent, null, null);
@@ -222,6 +197,8 @@
         mMessageList.add(CellBroadcastAlertServiceTest.createMessageForCmasMessageClass(12413,
                 SmsCbConstants.MESSAGE_ID_CMAS_ALERT_CHILD_ABDUCTION_EMERGENCY,
                 SmsCbConstants.MESSAGE_ID_CMAS_ALERT_CHILD_ABDUCTION_EMERGENCY));
+        intent.putParcelableArrayListExtra(CellBroadcastAlertService.SMS_CB_MESSAGE_EXTRA,
+                new ArrayList<>(mMessageList));
         activity.onNewIntent(intent);
 
         verify(mMockedNotificationManager, atLeastOnce()).cancel(
@@ -230,7 +207,6 @@
 
     public void testAnimationHandler() throws Throwable {
         CellBroadcastAlertDialog activity = startActivity();
-        CellBroadcastSettings.setUseResourcesForSubId(false);
 
         activity.mAnimationHandler.startIconAnimation(mSubId);
 
@@ -246,7 +222,7 @@
 
     public void testOnResume() throws Throwable {
         Intent intent = createActivityIntent();
-        intent.putExtra(CellBroadcastAlertDialog.FROM_NOTIFICATION_EXTRA, true);
+        intent.putExtra(CellBroadcastAlertDialog.DISMISS_NOTIFICATION_EXTRA, true);
 
         Looper.prepare();
         CellBroadcastAlertDialog activity = startActivity(intent, null, null);
@@ -261,7 +237,7 @@
 
     public void testOnPause() throws Throwable {
         Intent intent = createActivityIntent();
-        intent.putExtra(CellBroadcastAlertDialog.FROM_NOTIFICATION_EXTRA, true);
+        intent.putExtra(CellBroadcastAlertDialog.DISMISS_NOTIFICATION_EXTRA, true);
 
         Looper.prepare();
         CellBroadcastAlertDialog activity = startActivity(intent, null, null);
@@ -276,7 +252,7 @@
 
     public void testOnKeyDown() throws Throwable {
         Intent intent = createActivityIntent();
-        intent.putExtra(CellBroadcastAlertDialog.FROM_NOTIFICATION_EXTRA, true);
+        intent.putExtra(CellBroadcastAlertDialog.DISMISS_NOTIFICATION_EXTRA, true);
 
         Looper.prepare();
         CellBroadcastAlertDialog activity = startActivity(intent, null, null);
@@ -284,4 +260,48 @@
         assertTrue(activity.onKeyDown(0,
                 new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_FOCUS)));
     }
+
+    public void testOnConfigurationChanged() throws Throwable {
+        CellBroadcastAlertDialog activity = startActivity();
+        Configuration newConfig = new Configuration();
+
+        ImageView image = activity.findViewById(R.id.pictogramImage);
+        image.setVisibility(View.VISIBLE);
+        assertEquals(View.VISIBLE, image.getVisibility());
+
+        newConfig.orientation = Configuration.ORIENTATION_LANDSCAPE;
+        activity.onConfigurationChanged(newConfig);
+        assertNotNull(image.getLayoutParams());
+
+        newConfig.orientation = Configuration.ORIENTATION_PORTRAIT;
+        activity.onConfigurationChanged(newConfig);
+        assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, image.getLayoutParams().height);
+        assertEquals(ViewGroup.LayoutParams.WRAP_CONTENT, image.getLayoutParams().width);
+    }
+
+    public void testOnWindowFocusChanged() throws Throwable {
+        CellBroadcastAlertDialog activity = startActivity();
+
+        ImageView image = activity.findViewById(R.id.pictogramImage);
+        image.setVisibility(View.VISIBLE);
+        assertEquals(View.VISIBLE, image.getVisibility());
+
+        activity.onWindowFocusChanged(true);
+        assertNotNull(image.getLayoutParams());
+    }
+
+    public void testOnKeyDownWithEmptyMessageList() throws Throwable {
+        mMessageList = new ArrayList<>(1);
+
+        Intent intent = new Intent(getInstrumentation().getTargetContext(),
+                CellBroadcastAlertDialog.class);
+        intent.putParcelableArrayListExtra(CellBroadcastAlertService.SMS_CB_MESSAGE_EXTRA,
+                mMessageList);
+        intent.putExtra(CellBroadcastAlertDialog.DISMISS_NOTIFICATION_EXTRA, true);
+        Looper.prepare();
+        CellBroadcastAlertDialog activity = startActivity(intent, null, null);
+
+        assertTrue(activity.onKeyDown(0,
+                new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_FOCUS)));
+    }
 }
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertServiceTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertServiceTest.java
index 3a96d9f..00cd8c9 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertServiceTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastAlertServiceTest.java
@@ -21,12 +21,14 @@
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
 import android.provider.Telephony;
+import android.telephony.AccessNetworkConstants;
+import android.telephony.NetworkRegistrationInfo;
+import android.telephony.ServiceState;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbEtwsInfo;
 import android.telephony.SmsCbLocation;
@@ -39,11 +41,14 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.mockito.Mock;
 
 import java.util.ArrayList;
 
 public class CellBroadcastAlertServiceTest extends
         CellBroadcastServiceTestCase<CellBroadcastAlertService> {
+    @Mock
+    ServiceState mockSS;
 
     public CellBroadcastAlertServiceTest() {
         super(CellBroadcastAlertService.class);
@@ -144,13 +149,21 @@
         startService(intent);
     }
 
+    private void waitForServiceIntent() {
+        waitFor(() -> mServiceIntentToVerify != null);
+    }
+
     // Test handleCellBroadcastIntent method
     @InstrumentationTest
     // This test has a module dependency, so it is disabled for OEM testing because it is not a true
     // unit test
-    public void testHandleCellBroadcastIntent() throws Exception {
+    public void testHandleCellBroadcastIntent() {
+        doReturn(new String[]{"0x1112:rat=gsm, emergency=true"})
+                .when(mResources).getStringArray(
+                        eq(com.android.cellbroadcastreceiver.R.array.etws_alerts_range_strings));
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE);
         sendMessage(987654321);
-        waitForMs(500);
+        waitForServiceIntent();
 
         assertEquals(SHOW_NEW_ALERT_ACTION, mServiceIntentToVerify.getAction());
 
@@ -160,17 +173,122 @@
         compareCellBroadCastMessage(cbm, cbmTest);
     }
 
+    // Test testHandleCellBroadcastIntentDomesticRoaming method
+    @InstrumentationTest
+    // This test has a module dependency, so it is disabled for OEM testing because it is not a true
+    // unit test
+    public void testHandleCellBroadcastIntentDomesticRoaming() throws Exception {
+        doReturn(mockSS).when(mMockedTelephonyManager).getServiceState();
+        NetworkRegistrationInfo mockNeRegInfo = new NetworkRegistrationInfo(
+                NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+                NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING, 0, 0, false,
+                null, null, "", true, 0, 0, 0);
+        mockNeRegInfo.setRoamingType(ServiceState.ROAMING_TYPE_DOMESTIC);
+        doReturn(mockNeRegInfo).when(mockSS).getNetworkRegistrationInfo(anyInt(), anyInt());
+        doReturn(new String[]{"0x1112:rat=gsm, emergency=true, scope=domestic"})
+                .when(mResources).getStringArray(
+                        eq(com.android.cellbroadcastreceiver.R.array.etws_alerts_range_strings));
+
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE);
+        sendMessage(987654321);
+        waitForServiceIntent();
+
+        assertEquals(SHOW_NEW_ALERT_ACTION, mServiceIntentToVerify.getAction());
+
+        SmsCbMessage cbmTest = (SmsCbMessage) mServiceIntentToVerify.getExtras().get("message");
+        SmsCbMessage cbm = createMessage(987654321);
+
+        compareCellBroadCastMessage(cbm, cbmTest);
+    }
+
+    // Test testHandleCellBroadcastIntentInternationalRoaming method
+    @InstrumentationTest
+    // This test has a module dependency, so it is disabled for OEM testing because it is not a true
+    // unit test
+    public void testHandleCellBroadcastIntentInternationalRoaming() throws Exception {
+        doReturn(mockSS).when(mMockedTelephonyManager).getServiceState();
+        NetworkRegistrationInfo mockNeRegInfo = new NetworkRegistrationInfo(
+                NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+                NetworkRegistrationInfo.REGISTRATION_STATE_ROAMING, 0, 0, false,
+                null, null, "", true, 0, 0, 0);
+        mockNeRegInfo.setRoamingType(ServiceState.ROAMING_TYPE_INTERNATIONAL);
+        doReturn(mockNeRegInfo).when(mockSS).getNetworkRegistrationInfo(anyInt(), anyInt());
+        doReturn(new String[]{"0x1112:rat=gsm, emergency=true, scope=international"})
+                .when(mResources).getStringArray(
+                        eq(com.android.cellbroadcastreceiver.R.array.etws_alerts_range_strings));
+
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE);
+        sendMessage(987654321);
+        waitForServiceIntent();
+
+        assertEquals(SHOW_NEW_ALERT_ACTION, mServiceIntentToVerify.getAction());
+
+        SmsCbMessage cbmTest = (SmsCbMessage) mServiceIntentToVerify.getExtras().get("message");
+        SmsCbMessage cbm = createMessage(987654321);
+
+        compareCellBroadCastMessage(cbm, cbmTest);
+    }
+
+    // Test testHandleCellBroadcastIntentNonRoaming method
+    @InstrumentationTest
+    // This test has a module dependency, so it is disabled for OEM testing because it is not a true
+    // unit test
+    public void testHandleCellBroadcastIntentNonRoaming() throws Exception {
+        doReturn(mockSS).when(mMockedTelephonyManager).getServiceState();
+        NetworkRegistrationInfo mockNeRegInfo = new NetworkRegistrationInfo(
+                NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+                NetworkRegistrationInfo.REGISTRATION_STATE_HOME, 0, 0, false,
+                null, null, "", true, 0, 0, 0);
+        mockNeRegInfo.setRoamingType(ServiceState.ROAMING_TYPE_NOT_ROAMING);
+        doReturn(mockNeRegInfo).when(mockSS).getNetworkRegistrationInfo(anyInt(), anyInt());
+        doReturn(new String[]{"0x1112:rat=gsm, emergency=true, scope=international"})
+                .when(mResources).getStringArray(
+                        eq(com.android.cellbroadcastreceiver.R.array.etws_alerts_range_strings));
+
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE);
+        sendMessage(987654321);
+        waitForServiceIntent();
+        assertEquals(SHOW_NEW_ALERT_ACTION, mServiceIntentToVerify.getAction());
+
+        SmsCbMessage cbmTest = (SmsCbMessage) mServiceIntentToVerify.getExtras().get("message");
+        SmsCbMessage cbm = createMessage(987654321);
+
+        compareCellBroadCastMessage(cbm, cbmTest);
+    }
+
+    // Test testHandleCellBroadcastIntentNonMatchedScope method
+    @InstrumentationTest
+    // This test has a module dependency, so it is disabled for OEM testing because it is not a true
+    // unit test
+    public void testHandleCellBroadcastIntentNonMatchedScope() throws Exception {
+        doReturn(mockSS).when(mMockedTelephonyManager).getServiceState();
+        NetworkRegistrationInfo mockNeRegInfo = new NetworkRegistrationInfo(
+                NetworkRegistrationInfo.DOMAIN_CS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
+                NetworkRegistrationInfo.REGISTRATION_STATE_HOME, 0, 0, false,
+                null, null, "", true, 0, 0, 0);
+        mockNeRegInfo.setRoamingType(ServiceState.ROAMING_TYPE_DOMESTIC);
+        doReturn(mockNeRegInfo).when(mockSS).getNetworkRegistrationInfo(anyInt(), anyInt());
+        doReturn(new String[]{"0x1112:rat=gsm, emergency=true, scope=international"})
+                .when(mResources).getStringArray(
+                        eq(com.android.cellbroadcastreceiver.R.array.etws_alerts_range_strings));
+
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE);
+        sendMessage(987654321);
+        waitForServiceIntent();
+        assertNull(mServiceIntentToVerify);
+    }
+
     // Test showNewAlert method
     @InstrumentationTest
     // This test has a module dependency, so it is disabled for OEM testing because it is not a true
     // unit test
-    public void testShowNewAlert() throws Exception {
+    public void testShowNewAlert() {
         Intent intent = new Intent(mContext, CellBroadcastAlertService.class);
         intent.setAction(SHOW_NEW_ALERT_ACTION);
         SmsCbMessage message = createMessage(34788612);
         intent.putExtra("message", message);
         startService(intent);
-        waitForMs(500);
+        waitForServiceIntent();
 
         // verify audio service intent
         assertEquals(CellBroadcastAlertAudio.ACTION_START_ALERT_AUDIO,
@@ -195,13 +313,15 @@
     // This test has a module dependency, so it is disabled for OEM testing because it is not a true
     // unit test
     public void testShowNewAlertChildAbductionWithDefaultLanguage() {
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE);
         doReturn(new String[]{"0x111B:rat=gsm, emergency=true"})
-                .when(mResources).getStringArray(anyInt());
+                .when(mResources).getStringArray(
+                        eq(com.android.cellbroadcastreceiver.R.array.etws_alerts_range_strings));
         doReturn("").when(mResources).getString(anyInt());
 
         sendMessageForCmasMessageClass(34788613,
                 SmsCbConstants.MESSAGE_ID_CMAS_ALERT_CHILD_ABDUCTION_EMERGENCY);
-        waitForMs(500);
+        waitForServiceIntent();
 
         assertEquals(SHOW_NEW_ALERT_ACTION, mServiceIntentToVerify.getAction());
 
@@ -218,18 +338,18 @@
     // This test has a module dependency, so it is disabled for OEM testing because it is not a true
     // unit test
     public void testShowNewAlertChildAbduction() {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        prefs.edit().putBoolean(CellBroadcastSettings.KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE, true)
-                .commit();
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE);
+        enablePreference(CellBroadcastSettings.KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE);
 
         final String language = "es";
         doReturn(new String[]{"0x111B:rat=gsm, emergency=true, filter_language=true"})
-                .when(mResources).getStringArray(anyInt());
+                .when(mResources).getStringArray(
+                        eq(com.android.cellbroadcastreceiver.R.array.etws_alerts_range_strings));
         doReturn(language).when(mResources).getString(anyInt());
 
         sendMessageForCmasMessageClassAndLanguage(34788614,
                 SmsCbConstants.MESSAGE_ID_CMAS_ALERT_CHILD_ABDUCTION_EMERGENCY, language);
-        waitForMs(500);
+        waitForServiceIntent();
 
         assertEquals(SHOW_NEW_ALERT_ACTION, mServiceIntentToVerify.getAction());
 
@@ -240,4 +360,28 @@
 
         compareCellBroadCastMessage(cbm, cbmTest);
     }
+
+    public void testShouldDisplayMessage() {
+        sendMessage(1);
+        waitForServiceIntent();
+
+        CellBroadcastAlertService cellBroadcastAlertService =
+                (CellBroadcastAlertService) getService();
+
+        // shouldDisplayMessage should return true for ETWS message
+        SmsCbEtwsInfo etwsInfo = new SmsCbEtwsInfo(SmsCbEtwsInfo.ETWS_WARNING_TYPE_EARTHQUAKE, true,
+                true, true, null);
+        SmsCbMessage message = new SmsCbMessage(1, 2, 3, new SmsCbLocation(),
+                SmsCbEtwsInfo.ETWS_WARNING_TYPE_EARTHQUAKE,
+                "language", "body",
+                SmsCbMessage.MESSAGE_PRIORITY_EMERGENCY, etwsInfo,
+                null, 0, 1);
+
+        enablePreference(CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE);
+
+        assertNotNull("Message should have non-null ETWS info", message.getEtwsWarningInfo());
+        assertTrue("Message should be ETWS message", message.isEtwsMessage());
+        assertTrue("Should display ETWS message",
+                cellBroadcastAlertService.shouldDisplayMessage(message));
+    }
 }
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBackupAgentTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBackupAgentTest.java
new file mode 100644
index 0000000..bfba23b
--- /dev/null
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBackupAgentTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.cellbroadcastreceiver.unit;
+
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+
+import android.app.backup.BackupAgentHelper;
+import android.app.backup.BackupHelperDispatcher;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+
+import com.android.cellbroadcastreceiver.CellBroadcastBackupAgent;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.lang.reflect.Field;
+
+/**
+ * Unittest for class com.android.cellbroadcastreceiver.CellBroadcastBackupAgent.
+ */
+public class CellBroadcastBackupAgentTest {
+    @Mock
+    private BackupHelperDispatcher mMockDispatcher;
+    @Mock
+    private Context mMockContext;
+    /** The CellBroadcastBackupAgent object to test against. */
+    private CellBroadcastBackupAgent mBackupAgentUT = new CellBroadcastBackupAgent();
+
+    /**
+     * Replace BackupAgentHelper#mDispatcher with mock object.
+     */
+    private void mockBackupDispatcher() throws Exception {
+        Field field = BackupAgentHelper.class.getDeclaredField("mDispatcher");
+        field.setAccessible(true);
+        field.set(mBackupAgentUT, mMockDispatcher);
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void testOnCreate() throws Exception {
+        mockBackupDispatcher();
+        mBackupAgentUT.onCreate();
+        // Ideally we should verify creation of SharedPreferencesBackupHelper, but it's not quite
+        // testable. So now we just match it with any().
+        verify(mMockDispatcher).addHelper(eq(CellBroadcastBackupAgent.SHARED_KEY), any());
+    }
+
+    @Test
+    public void testRestoreFinish() throws Exception {
+        mockBackupDispatcher();
+        mBackupAgentUT.attach(mMockContext);
+
+        ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        mBackupAgentUT.onRestoreFinished();
+        verify(mMockContext).sendBroadcastAsUser(intentArgumentCaptor.capture(),
+                eq(UserHandle.SYSTEM));
+    }
+}
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
index 5dec04e..59bbbdd 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastBootupConfigTest.java
@@ -39,7 +39,7 @@
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 
 import android.content.Intent;
@@ -49,6 +49,7 @@
 import androidx.test.filters.FlakyTest;
 
 import com.android.cellbroadcastreceiver.CellBroadcastConfigService;
+import com.android.cellbroadcastreceiver.CellBroadcastSettings;
 import com.android.internal.telephony.ISms;
 
 import org.junit.After;
@@ -137,12 +138,22 @@
 
     @FlakyTest
     public void testConfiguration() throws Exception {
+        String[] preferenceKeys = {
+                CellBroadcastSettings.KEY_ENABLE_ALERTS_MASTER_TOGGLE,
+                CellBroadcastSettings.KEY_ENABLE_CMAS_EXTREME_THREAT_ALERTS,
+                CellBroadcastSettings.KEY_ENABLE_CMAS_SEVERE_THREAT_ALERTS,
+                CellBroadcastSettings.KEY_ENABLE_CMAS_AMBER_ALERTS,
+                CellBroadcastSettings.KEY_ENABLE_PUBLIC_SAFETY_MESSAGES,
+                CellBroadcastSettings.KEY_ENABLE_EMERGENCY_ALERTS,
+        };
+        for (String key : preferenceKeys) {
+            enablePreference(key);
+        }
 
         Intent intent = new Intent(mContext, CellBroadcastConfigService.class);
         intent.setAction(CellBroadcastConfigService.ACTION_ENABLE_CHANNELS);
 
         startService(intent);
-        waitForMs(200);
 
         CbConfig[] configs = new CbConfig[] {
                 new CbConfig(MESSAGE_ID_CMAS_ALERT_PRESIDENTIAL_LEVEL,
@@ -189,8 +200,9 @@
                         SmsCbMessage.MESSAGE_FORMAT_3GPP),
         };
 
-        verify(mSmsService, times(configs.length)).enableCellBroadcastRangeForSubscriber(anyInt(),
-                mStartIds.capture(), mEndIds.capture(), mTypes.capture());
+        verify(mSmsService, timeout(10000).times(configs.length))
+                .enableCellBroadcastRangeForSubscriber(
+                        anyInt(), mStartIds.capture(), mEndIds.capture(), mTypes.capture());
 
         for (int i = 0; i < configs.length; i++) {
             assertEquals("i=" + i, configs[i].startId, mStartIds.getAllValues().get(i).intValue());
@@ -198,4 +210,4 @@
             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/CellBroadcastChannelManagerTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastChannelManagerTest.java
index c63d773..a20345e 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastChannelManagerTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastChannelManagerTest.java
@@ -17,6 +17,9 @@
 package com.android.cellbroadcastreceiver.unit;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.telephony.SubscriptionManager;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -26,6 +29,7 @@
 import com.android.cellbroadcastreceiver.CellBroadcastChannelManager.CellBroadcastChannelRange;
 import com.android.cellbroadcastreceiver.unit.CellBroadcastTest;
 
+import java.util.Arrays;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -47,18 +51,17 @@
         super.tearDown();
     }
 
-    /**
-     * Test getting cell broadcast additional channels from Carrier Config.
-     */
     @Test
     @SmallTest
     public void testGetCellBroadcastChannelRanges() throws Exception {
         putResources(com.android.cellbroadcastreceiver.R.array.additional_cbs_channels_strings,
                 new String[]{
-                        "12:type=etws_earthquake, emergency=true",
-                        "456:type=etws_tsunami, emergency=true",
-                        "0xAC00-0xAFED:type=other, emergency=false",
-                        "54-60:emergency=true", "100-200", "0xA804:type=test, emergency=true"});
+                        "12:type=etws_earthquake, emergency=true, display=false, always_on=true",
+                        "456:type=etws_tsunami, emergency=true, alert_duration=60000, "
+                                + "scope=domestic", "0xAC00-0xAFED:type=other, emergency=false, "
+                        + "override_dnd=true, scope=carrier", "54-60:emergency=true, "
+                        + "testing_mode=true", "100-200", "0xA804:type=test, "
+                        + "emergency=true, exclude_from_sms_inbox=true, vibration=0|350|250|350"});
 
         CellBroadcastChannelManager channelManager = new CellBroadcastChannelManager(mContext,
                 SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
@@ -70,30 +73,64 @@
         assertEquals(12, list.get(0).mEndId);
         assertEquals(AlertType.ETWS_EARTHQUAKE, list.get(0).mAlertType);
         assertEquals(CellBroadcastChannelRange.LEVEL_EMERGENCY, list.get(0).mEmergencyLevel);
+        assertTrue(list.get(0).mAlwaysOn);
+        assertFalse(list.get(0).mDisplay);
+        assertFalse(list.get(0).mOverrideDnd);
+        assertTrue(list.get(0).mWriteToSmsInbox);
+        assertFalse(list.get(0).mTestMode);
 
         assertEquals(456, list.get(1).mStartId);
         assertEquals(456, list.get(1).mEndId);
         assertEquals(AlertType.ETWS_TSUNAMI, list.get(1).mAlertType);
         assertEquals(CellBroadcastChannelRange.LEVEL_EMERGENCY, list.get(1).mEmergencyLevel);
+        assertFalse(list.get(1).mAlwaysOn);
+        assertTrue(list.get(1).mDisplay);
+        assertFalse(list.get(1).mOverrideDnd);
+        assertTrue(list.get(1).mWriteToSmsInbox);
+        assertFalse(list.get(1).mTestMode);
+        assertEquals(60000, list.get(1).mAlertDuration);
 
         assertEquals(0xAC00, list.get(2).mStartId);
         assertEquals(0xAFED, list.get(2).mEndId);
         assertEquals(AlertType.OTHER, list.get(2).mAlertType);
         assertEquals(CellBroadcastChannelRange.LEVEL_NOT_EMERGENCY, list.get(2).mEmergencyLevel);
+        assertFalse(list.get(2).mAlwaysOn);
+        assertTrue(list.get(2).mDisplay);
+        assertTrue(list.get(2).mOverrideDnd);
+        assertTrue(list.get(2).mWriteToSmsInbox);
+        assertFalse(list.get(2).mTestMode);
+        assertEquals(list.get(2).mScope, CellBroadcastChannelRange.SCOPE_CARRIER);
 
         assertEquals(54, list.get(3).mStartId);
         assertEquals(60, list.get(3).mEndId);
         assertEquals(AlertType.DEFAULT, list.get(3).mAlertType);
         assertEquals(CellBroadcastChannelRange.LEVEL_EMERGENCY, list.get(3).mEmergencyLevel);
+        assertFalse(list.get(3).mAlwaysOn);
+        assertTrue(list.get(3).mDisplay);
+        assertFalse(list.get(3).mOverrideDnd);
+        assertTrue(list.get(3).mWriteToSmsInbox);
+        assertTrue(list.get(3).mTestMode);
 
         assertEquals(100, list.get(4).mStartId);
         assertEquals(200, list.get(4).mEndId);
         assertEquals(AlertType.DEFAULT, list.get(4).mAlertType);
         assertEquals(CellBroadcastChannelRange.LEVEL_UNKNOWN, list.get(4).mEmergencyLevel);
+        assertFalse(list.get(4).mAlwaysOn);
+        assertTrue(list.get(4).mDisplay);
+        assertFalse(list.get(4).mOverrideDnd);
+        assertTrue(list.get(4).mWriteToSmsInbox);
+        assertFalse(list.get(4).mTestMode);
 
         assertEquals(0xA804, list.get(5).mStartId);
         assertEquals(0xA804, list.get(5).mEndId);
         assertEquals(AlertType.TEST, list.get(5).mAlertType);
         assertEquals(CellBroadcastChannelRange.LEVEL_EMERGENCY, list.get(5).mEmergencyLevel);
+        assertFalse(list.get(5).mAlwaysOn);
+        assertTrue(list.get(5).mDisplay);
+        assertFalse(list.get(5).mOverrideDnd);
+        assertFalse(list.get(5).mWriteToSmsInbox);
+        assertFalse(list.get(5).mTestMode);
+        assertTrue(Arrays.equals(new int[]{0, 350, 250, 350}, list.get(5).mVibrationPattern));
+        assertNotEquals(list.get(4).toString(), list.get(5).toString());
     }
 }
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastContentProviderTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastContentProviderTest.java
index 6b0cffe..07264e7 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastContentProviderTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastContentProviderTest.java
@@ -15,18 +15,27 @@
  */
 package com.android.cellbroadcastreceiver.unit;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.content.ContentProvider;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.UserManager;
 import android.provider.Telephony.CellBroadcasts;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbEtwsInfo;
 import android.telephony.SmsCbLocation;
 import android.telephony.SmsCbMessage;
+import android.telephony.SubscriptionManager;
 import android.test.mock.MockContentResolver;
 import android.test.mock.MockContext;
 import android.util.Log;
@@ -62,6 +71,16 @@
     private CellBroadcastContentProviderTestable mCellBroadcastProviderTestable;
     private MockContextWithProvider mContext;
     private MockContentResolver mContentResolver;
+    @Mock
+    UserManager mUserManager;
+    @Mock
+    SubscriptionManager mSubManager;
+    @Mock
+    ContentProvider mMockSmsProvider;
+    @Mock
+    Resources mMockResource;
+    @Mock
+    Context mMockContext;
 
     @Override
     protected void setUp() throws Exception {
@@ -80,6 +99,9 @@
     }
 
     @Test
+    @InstrumentationTest
+    // This test requires the content provider from the cell broadcast module, so it is disabled for
+    // OEM testing because it is not a true unit test
     public void testInsert() {
         try {
             ContentValues msg = new ContentValues();
@@ -92,6 +114,9 @@
     }
 
     @Test
+    @InstrumentationTest
+    // This test requires the content provider from the cell broadcast module, so it is disabled for
+    // OEM testing because it is not a true unit test
     public void testDelete() {
         try {
             mContentResolver.delete(CONTENT_URI, null, null);
@@ -102,6 +127,9 @@
     }
 
     @Test
+    @InstrumentationTest
+    // This test requires the content provider from the cell broadcast module, so it is disabled for
+    // OEM testing because it is not a true unit test
     public void testUpdate() {
         try {
             mContentResolver.update(CONTENT_URI, null, null);
@@ -112,6 +140,9 @@
     }
 
     @Test
+    @InstrumentationTest
+    // This test requires the content provider from the cell broadcast module, so it is disabled for
+    // OEM testing because it is not a true unit test
     public void testDeleteAll() {
         // Insert a cell broadcast message
         mCellBroadcastProviderTestable.insertNewBroadcast(fakeSmsCbMessage());
@@ -127,6 +158,9 @@
     }
 
     @Test
+    @InstrumentationTest
+    // This test requires the content provider from the cell broadcast module, so it is disabled for
+    // OEM testing because it is not a true unit test
     public void testDeleteBroadcast() {
         // Insert two cell broadcast message
         mCellBroadcastProviderTestable.insertNewBroadcast(fakeSmsCbMessage());
@@ -143,6 +177,56 @@
     }
 
     @Test
+    @InstrumentationTest
+    public void testMarkSmsSyncPending() {
+        SmsCbMessage msg = fakeSmsCbMessage();
+        long deliveryTime = msg.getReceivedTime();
+        mCellBroadcastProviderTestable.insertNewBroadcast(msg);
+        // Verify that there is no record with smsSyncPending set
+        Cursor cursor = mContentResolver.query(CONTENT_URI,
+                CellBroadcastDatabaseHelper.QUERY_COLUMNS,
+                CellBroadcastDatabaseHelper.SMS_SYNC_PENDING + "=1" , null, null);
+        assertThat(cursor.getCount()).isEqualTo(0);
+        mCellBroadcastProviderTestable.markBroadcastSmsSyncPending(
+                CellBroadcasts.DELIVERY_TIME,
+                deliveryTime, true);
+        cursor = mContentResolver.query(CONTENT_URI,
+                CellBroadcastDatabaseHelper.QUERY_COLUMNS,
+                CellBroadcastDatabaseHelper.SMS_SYNC_PENDING + "=1" , null, null);
+        assertThat(cursor.getCount()).isEqualTo(1);
+    }
+
+    @Test
+    @InstrumentationTest
+    public void testWriteSmsInboxBeforeUserUnlock() {
+        doReturn(false).when(mUserManager).isUserUnlocked();
+        doReturn(true).when(mUserManager).isSystemUser();
+        SmsCbMessage msg = fakeSmsCbMessage();
+        mCellBroadcastProviderTestable.insertNewBroadcast(msg);
+        // verify does not write message to SMS db
+        mCellBroadcastProviderTestable.writeMessageToSmsInbox(msg, mContext);
+        // Verify that there is a record with smsSyncPending set
+        Cursor cursor = mContentResolver.query(CONTENT_URI,
+                CellBroadcastDatabaseHelper.QUERY_COLUMNS,
+                CellBroadcastDatabaseHelper.SMS_SYNC_PENDING + "=1" , null, null);
+        assertThat(cursor.getCount()).isEqualTo(1);
+        verify(mMockSmsProvider, times(0)).insert(any(), any());
+    }
+
+    @Test
+    @InstrumentationTest
+    public void testWriteSmsInboxNonSystemUser() {
+        doReturn(false).when(mUserManager).isSystemUser();
+        SmsCbMessage msg = fakeSmsCbMessage();
+        // verify does not write message to SMS db
+        mCellBroadcastProviderTestable.writeMessageToSmsInbox(msg, mContext);
+        verify(mMockSmsProvider, times(0)).insert(any(), any());
+    }
+
+    @Test
+    @InstrumentationTest
+    // This test requires the content provider from the cell broadcast module, so it is disabled for
+    // OEM testing because it is not a true unit test
     public void testInsertQuery() {
         // Insert a cell broadcast message
         mCellBroadcastProviderTestable.insertNewBroadcast(fakeSmsCbMessage());
@@ -202,6 +286,16 @@
         }
 
         @Override
+        public Resources getResources() {
+            return mMockResource;
+        }
+
+        @Override
+        public Context createConfigurationContext(Configuration overrideConfiguration) {
+            return mMockContext;
+        }
+
+        @Override
         public MockContentResolver getContentResolver() {
             return mResolver;
         }
@@ -209,8 +303,15 @@
 
         @Override
         public Object getSystemService(String name) {
-            Log.d(TAG, "getSystemService: returning null");
-            return null;
+            switch(name) {
+                case Context.USER_SERVICE:
+                    return mUserManager;
+                case Context.TELEPHONY_SUBSCRIPTION_SERVICE:
+                    return mSubManager;
+                default:
+                    Log.d(TAG, "getSystemService: returning null");
+                    return null;
+            }
         }
 
         @Override
@@ -226,6 +327,6 @@
                 false, false, null),
                 new SmsCbCmasInfo(CMAS_MESSAGE_CLASS, CMAS_CATEGORY, CMAS_RESPONSE_TYPE,
                         CMAS_SEVERITY, CMAS_URGENCY, CMAS_CERTAINTY), 0, null,
-                System.currentTimeMillis(), 1, 0);
+                System.currentTimeMillis(), 1, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
     }
  }
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastContentProviderTestable.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastContentProviderTestable.java
index 8730683..1bd8f63 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastContentProviderTestable.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastContentProviderTestable.java
@@ -44,12 +44,23 @@
         mOpenHelper.close();
     }
 
-    public static class InMemoryCellBroadcastProviderDbHelper extends SQLiteOpenHelper {
+    @Override
+    protected SQLiteDatabase awaitInitAndGetWritableDatabase() {
+        // Do not wait on latch in testing
+        return mOpenHelper.getWritableDatabase();
+    }
+
+    @Override
+    protected SQLiteDatabase awaitInitAndGetReadableDatabase() {
+        // Do not wait on latch in testing
+        return mOpenHelper.getReadableDatabase();
+    }
+
+    public static class InMemoryCellBroadcastProviderDbHelper extends CellBroadcastDatabaseHelper {
         public InMemoryCellBroadcastProviderDbHelper() {
             super(InstrumentationRegistry.getTargetContext(),
-                    null,    // db file name is null for in-memory db
-                    null,    // CursorFactory is null by default
-                    1);      // db version is no-op for tests
+                    false,
+                    null);    // db file name is null for in-memory db
         }
 
         @Override
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastDatabaseHelperTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastDatabaseHelperTest.java
index 2175968..4a63e1d 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastDatabaseHelperTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastDatabaseHelperTest.java
@@ -19,12 +19,16 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 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.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;
 import android.database.sqlite.SQLiteDatabase;
@@ -33,17 +37,19 @@
 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 {
@@ -57,15 +63,24 @@
     @Mock
     ContentResolver mContentResolver;
     @Mock
-    IContentProvider mContentProviderClient;
+    ContentProviderClient mContentProviderClient;
     @Mock
     Cursor mCursor;
+    @Mock
+    SharedPreferences mSharedPreferences;
+    @Mock
+    android.content.SharedPreferences.Editor mEditor;
 
     @Before
     public void setUp() {
         Log.d(TAG, "setUp() +");
         MockitoAnnotations.initMocks(this);
         doReturn(mContentResolver).when(mContext).getContentResolver();
+        doReturn(mSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
+        doReturn(mEditor).when(mSharedPreferences).edit();
+        doReturn(mEditor).when(mEditor).putBoolean(anyString(), anyBoolean());
+        doReturn(true).when(mEditor).commit();
+
         mHelper = new CellBroadcastDatabaseHelper(mContext, false);
         mInMemoryDbHelper = new InMemoryCellBroadcastProviderDbHelperV11();
         Log.d(TAG, "setUp() -");
@@ -98,11 +113,26 @@
     }
 
     @Test
+    public void databaseHelperOnUpgrade_V13() {
+        Log.d(TAG, "databaseHelperOnUpgrade_V13");
+        SQLiteDatabase db = mInMemoryDbHelper.getWritableDatabase();
+        // version 11 -> 13 trigger in onUpgrade
+        mHelper.onUpgrade(db, 11, 13);
+        // the upgraded db must have the slot index field
+        Cursor upgradedCursor = db.query(CellBroadcastDatabaseHelper.TABLE_NAME,
+                null, null, null, null, null, null);
+        String[] upgradedColumns = upgradedCursor.getColumnNames();
+        Log.d(TAG, "cellbroadcastreceiver columns: " + Arrays.toString(upgradedColumns));
+        assertTrue(Arrays.asList(upgradedColumns).contains(CellBroadcasts.SLOT_INDEX));
+        assertTrue(Arrays.asList(upgradedColumns).contains(
+                CellBroadcastDatabaseHelper.SMS_SYNC_PENDING));
+    }
+
+    @Test
     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
@@ -128,7 +158,7 @@
                 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);
@@ -136,9 +166,9 @@
                 CellBroadcastDatabaseHelper.QUERY_COLUMNS, null, null, null, null, null);
         assertEquals(0, cursor.getCount());
 
-        mHelper.migrateFromLegacy(db);
+        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 7c1da6d..c2ac96c 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastListActivityTest.java
@@ -51,14 +51,15 @@
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.Looper;
+import android.os.UserManager;
 import android.provider.Telephony;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 
-import com.android.cellbroadcastreceiver.CellBroadcastAlertService;
 import com.android.cellbroadcastreceiver.CellBroadcastListActivity;
 import com.android.cellbroadcastreceiver.CellBroadcastListItem;
 import com.android.cellbroadcastreceiver.R;
@@ -74,10 +75,14 @@
 
 public class CellBroadcastListActivityTest extends
         CellBroadcastActivityTestCase<CellBroadcastListActivity> {
+    private static final int TEST_TIMEOUT_MILLIS = 1000;
 
     @Mock
     private NotificationManager mMockNotificationManager;
 
+    @Mock
+    private UserManager mMockUserManager;
+
 
     @Captor
     private ArgumentCaptor<String> mColumnCaptor;
@@ -87,6 +92,9 @@
         super.setUp();
         MockitoAnnotations.initMocks(this);
         injectSystemService(NotificationManager.class, mMockNotificationManager);
+        injectSystemService(UserManager.class, mMockUserManager);
+
+        doReturn(true).when(mMockUserManager).isAdminUser();
     }
 
     @After
@@ -100,7 +108,6 @@
 
     public void testOnCreate() throws Throwable {
         startActivity();
-        verify(mMockNotificationManager).cancel(eq(CellBroadcastAlertService.NOTIFICATION_ID));
         stopActivity();
     }
 
@@ -212,21 +219,19 @@
         // 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();
-        boolean alertDialogCreated = false;
-        try {
-            activity.mListFragment.onContextItemSelected(mockMenuItem);
-        } catch (WindowManager.BadTokenException e) {
-            // We can't mock WindowManager because WindowManagerImpl is final, so instead we just
-            // verify that this exception is thrown when we try to create the AlertDialog
-            alertDialogCreated = true;
-        }
+        activity.mListFragment.onContextItemSelected(mockMenuItem);
+        waitForHandlerAction(Handler.getMain(), TEST_TIMEOUT_MILLIS);
 
-        assertTrue("onContextItemSelected - MENU_DELETE should create alert dialog",
-                alertDialogCreated);
+        assertNotNull("onContextItemSelected - MENU_DELETE_ALL should create alert dialog",
+                activity.mListFragment.getFragmentManager().findFragmentByTag(
+                        CellBroadcastListActivity.CursorLoaderListFragment.KEY_DELETE_DIALOG));
+
         verify(mockCursor, atLeastOnce()).getColumnIndexOrThrow(eq(Telephony.CellBroadcasts._ID));
+        activity.mListFragment.clearSelectedMessages();
         stopActivity();
     }
 
@@ -307,17 +312,12 @@
 
         // must call looper.prepare to create alertdialog
         Looper.prepare();
-        boolean alertDialogCreated = false;
-        try {
-            activity.mListFragment.onOptionsItemSelected(mockMenuItem);
-        } catch (WindowManager.BadTokenException e) {
-            // We can't mock WindowManager because WindowManagerImpl is final, so instead we just
-            // verify that this exception is thrown when we try to create the AlertDialog
-            alertDialogCreated = true;
-        }
+        activity.mListFragment.onOptionsItemSelected(mockMenuItem);
+        waitForHandlerAction(Handler.getMain(), TEST_TIMEOUT_MILLIS);
 
-        assertTrue("onContextItemSelected - MENU_DELETE_ALL should create alert dialog",
-                alertDialogCreated);
+        assertNotNull("onContextItemSelected - MENU_DELETE_ALL should create alert dialog",
+                activity.mListFragment.getFragmentManager().findFragmentByTag(
+                        CellBroadcastListActivity.CursorLoaderListFragment.KEY_DELETE_DIALOG));
 
         // "show all messages" and "show regular messages" options return false to allow normal
         // menu  processing to continue
@@ -339,7 +339,7 @@
         doReturn(mockMenuItem).when(mockMenu).add(anyInt(), anyInt(), anyInt(), anyInt());
 
         activity.mListFragment.onCreateOptionsMenu(mockMenu, null);
-        verify(mockMenu, times(3)).add(anyInt(), anyInt(), anyInt(), anyInt());
+        verify(mockMenu, times(4)).add(anyInt(), anyInt(), anyInt(), anyInt());
     }
 
     public void testFragmentOnPrepareOptionsMenu() throws Throwable {
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverTest.java
index 06314a0..76b37c9 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastReceiverTest.java
@@ -16,8 +16,11 @@
 
 package com.android.cellbroadcastreceiver.unit;
 
+import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+import static com.google.common.truth.Truth.assertThat;
+
 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.ArgumentMatchers.eq;
@@ -28,9 +31,9 @@
 import static org.mockito.Mockito.verify;
 
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.IContentProvider;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -41,6 +44,7 @@
 import android.provider.Telephony;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.telephony.cdma.CdmaSmsCbProgramData;
 
 import com.android.cellbroadcastreceiver.CellBroadcastAlertService;
@@ -54,7 +58,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,12 +71,6 @@
     @Mock
     UserManager mUserManager;
     @Mock
-    SharedPreferences mSharedPreferences;
-    @Mock
-    private SharedPreferences.Editor mEditor;
-    @Mock
-    SharedPreferences mDefaultSharedPreferences;
-    @Mock
     Intent mIntent;
     @Mock
     PackageManager mPackageManager;
@@ -83,6 +80,11 @@
     ContentResolver mContentResolver;
     @Mock
     IContentProvider mContentProviderClient;
+    @Mock
+    TelephonyManager mMockTelephonyManager;
+    @Mock
+    SubscriptionManager mSubscriptionManager;
+    FakeSharedPreferences mFakeSharedPreferences = new FakeSharedPreferences();
 
     private Configuration mConfiguration = new Configuration();
     private AudioDeviceInfo[] mDevices = new AudioDeviceInfo[0];
@@ -114,23 +116,25 @@
     @Before
     public void setUp() throws Exception {
         super.setUp(this.getClass().getSimpleName());
-        MockitoAnnotations.initMocks(this);
         doReturn(mConfiguration).when(mResources).getConfiguration();
         mCellBroadcastReceiver = spy(new CellBroadcastReceiver());
         doReturn(mResources).when(mCellBroadcastReceiver).getResourcesMethod();
-        doNothing().when(mCellBroadcastReceiver).startConfigService();
+        doNothing().when(mCellBroadcastReceiver).startConfigServiceToEnableChannels();
         doReturn(mContext).when(mContext).getApplicationContext();
         doReturn(mPackageName).when(mContext).getPackageName();
+        doReturn(mFakeSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
+        doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
+        doReturn(false).when(mUserManager).isSystemUser();
+        setContext();
     }
 
     @Test
     public void testOnReceive_actionCarrierConfigChanged() {
         doReturn(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED).when(mIntent).getAction();
-        doNothing().when(mCellBroadcastReceiver).initializeSharedPreference();
         doNothing().when(mCellBroadcastReceiver).enableLauncher();
         mCellBroadcastReceiver.onReceive(mContext, mIntent);
-        verify(mCellBroadcastReceiver).initializeSharedPreference();
-        verify(mCellBroadcastReceiver).startConfigService();
+        verify(mCellBroadcastReceiver).initializeSharedPreference(any(), anyInt());
+        verify(mCellBroadcastReceiver).startConfigServiceToEnableChannels();
         verify(mCellBroadcastReceiver).enableLauncher();
     }
 
@@ -140,17 +144,26 @@
         doReturn(true).when(mIntent)
                 .getBooleanExtra("android.telephony.extra.REBROADCAST_ON_UNLOCK", false);
         mCellBroadcastReceiver.onReceive(mContext, mIntent);
-        verify(mCellBroadcastReceiver, never()).initializeSharedPreference();
-        verify(mCellBroadcastReceiver, never()).startConfigService();
+        verify(mCellBroadcastReceiver, never()).initializeSharedPreference(any(), anyInt());
+        verify(mCellBroadcastReceiver, never()).startConfigServiceToEnableChannels();
         verify(mCellBroadcastReceiver, never()).enableLauncher();
     }
 
     @Test
+    public void testOnReceive_actionBootCompleted() {
+        doReturn(mContentResolver).when(mContext).getContentResolver();
+        doReturn(mContentProviderClient).when(mContentResolver).acquireContentProviderClient(
+                "cellbroadcasts-app");
+        doReturn(Intent.ACTION_BOOT_COMPLETED).when(mIntent).getAction();
+        mCellBroadcastReceiver.onReceive(mContext, mIntent);
+    }
+
+    @Test
     public void testOnReceive_cellbroadcastStartConfigAction() {
         doReturn(CellBroadcastReceiver.CELLBROADCAST_START_CONFIG_ACTION).when(mIntent).getAction();
         mCellBroadcastReceiver.onReceive(mContext, mIntent);
-        verify(mCellBroadcastReceiver, never()).initializeSharedPreference();
-        verify(mCellBroadcastReceiver).startConfigService();
+        verify(mCellBroadcastReceiver, never()).initializeSharedPreference(any(), anyInt());
+        verify(mCellBroadcastReceiver).startConfigServiceToEnableChannels();
     }
 
     @Test
@@ -159,8 +172,8 @@
                 .when(mIntent).getAction();
         doReturn(mUserManager).when(mContext).getSystemService(anyString());
         mCellBroadcastReceiver.onReceive(mContext, mIntent);
-        verify(mCellBroadcastReceiver, never()).initializeSharedPreference();
-        verify(mCellBroadcastReceiver).startConfigService();
+        verify(mCellBroadcastReceiver, never()).initializeSharedPreference(any(), anyInt());
+        verify(mCellBroadcastReceiver).startConfigServiceToEnableChannels();
     }
 
     @Test
@@ -196,30 +209,93 @@
     }
 
     @Test
-    public void testInitializeSharedPreference_ifSystemUser() {
+    public void testInitializeSharedPreference_ifSystemUser_invalidSub() {
         doReturn("An invalid action").when(mIntent).getAction();
-        doReturn(true).when(mCellBroadcastReceiver).isSystemUser();
-        doReturn(mDefaultSharedPreferences).when(mCellBroadcastReceiver)
-                .getDefaultSharedPreferences();
+        doReturn(true).when(mUserManager).isSystemUser();
         doReturn(true).when(mCellBroadcastReceiver).sharedPrefsHaveDefaultValues();
         doNothing().when(mCellBroadcastReceiver).adjustReminderInterval();
 
-        mCellBroadcastReceiver.initializeSharedPreference();
-        verify(mCellBroadcastReceiver).getDefaultSharedPreferences();
+        mCellBroadcastReceiver.initializeSharedPreference(mContext, INVALID_SUBSCRIPTION_ID);
+        verify(mContext, never()).startService(any());
+        // Check interval.
+    }
+
+    private void mockTelephonyManager() {
+        doReturn(mMockTelephonyManager).when(mMockTelephonyManager)
+                .createForSubscriptionId(anyInt());
+        doReturn(Context.TELEPHONY_SERVICE).when(mContext).getSystemServiceName(
+                TelephonyManager.class);
+        doReturn(mMockTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+    }
+
+    @Test
+    public void testInitializeSharedPreference_ifSystemUser_firstSub() throws Exception {
+        doReturn("An invalid action").when(mIntent).getAction();
+        doReturn(true).when(mUserManager).isSystemUser();
+        doReturn(true).when(mCellBroadcastReceiver).sharedPrefsHaveDefaultValues();
+        doNothing().when(mCellBroadcastReceiver).adjustReminderInterval();
+        mockTelephonyManager();
+
+        int subId = 1;
+        int otherSubId = 2;
+        // The subId has to match default sub for it to take action.
+        doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mSubService).getDefaultSubId();
+        mCellBroadcastReceiver.initializeSharedPreference(mContext, subId);
+        verify(mContext, never()).startService(any());
+
+        // Not starting ConfigService, not matching default subId.
+        doReturn(otherSubId).when(mSubService).getDefaultSubId();
+        mCellBroadcastReceiver.initializeSharedPreference(mContext, subId);
+        verify(mContext, never()).startService(any());
+
+        // Not starting ConfigService, simCarrierId is UNKNOWN.
+        doReturn(subId).when(mSubService).getDefaultSubId();
+        doReturn(TelephonyManager.UNKNOWN_CARRIER_ID).when(mMockTelephonyManager)
+                .getSimCarrierId();
+        mCellBroadcastReceiver.initializeSharedPreference(mContext, subId);
+        verify(mContext, never()).startService(any());
+
+        // Not starting ConfigService, as there was no previous carrierId.
+        doReturn(subId).when(mMockTelephonyManager).getSimCarrierId();
+        mCellBroadcastReceiver.initializeSharedPreference(mContext, subId);
+        verify(mContext, never()).startService(any());
+    }
+
+    @Test
+    public void testInitializeSharedPreference_ifSystemUser_carrierChange() throws Exception {
+        doReturn("An invalid action").when(mIntent).getAction();
+        doReturn(true).when(mUserManager).isSystemUser();
+        doReturn(true).when(mCellBroadcastReceiver).sharedPrefsHaveDefaultValues();
+        doNothing().when(mCellBroadcastReceiver).adjustReminderInterval();
+        mockTelephonyManager();
+
+        int firstSubId = 1;
+        int secondSubId = 2;
+        // Initialize for first sub.
+        doReturn(firstSubId).when(mSubService).getDefaultSubId();
+        doReturn(firstSubId).when(mMockTelephonyManager).getSimCarrierId();
+        mCellBroadcastReceiver.initializeSharedPreference(mContext, firstSubId);
+        verify(mContext, never()).startService(any());
+
+        // InitializeSharedPreference for second sub.
+        // Starting ConfigService, as there's a carrierId change.
+        doReturn(secondSubId).when(mSubService).getDefaultSubId();
+        doReturn(secondSubId).when(mMockTelephonyManager).getSimCarrierId();
+        mCellBroadcastReceiver.initializeSharedPreference(mContext, secondSubId);
+        verify(mContext).startService(any());
     }
 
     @Test
     public void testInitializeSharedPreference_ifNotSystemUser() {
         doReturn("An invalid action").when(mIntent).getAction();
-        doReturn(false).when(mCellBroadcastReceiver).isSystemUser();
+        doReturn(false).when(mUserManager).isSystemUser();
 
-        mCellBroadcastReceiver.initializeSharedPreference();
-        verify(mSharedPreferences, never()).getBoolean(anyString(), anyBoolean());
+        mCellBroadcastReceiver.initializeSharedPreference(any(), anyInt());
+        assertThat(mFakeSharedPreferences.getValueCount()).isEqualTo(0);
     }
 
     @Test
     public void testMigrateSharedPreferenceFromLegacyWhenNoLegacyProvider() {
-        setContext();
         doReturn(mContentResolver).when(mContext).getContentResolver();
         doReturn(null).when(mContentResolver).acquireContentProviderClient(
                 Telephony.CellBroadcasts.AUTHORITY_LEGACY);
@@ -230,62 +306,44 @@
 
     @Test
     public void testMigrateSharedPreferenceFromLegacyWhenBundleNull() throws RemoteException {
-        setContext();
         doReturn(mContentResolver).when(mContext).getContentResolver();
         doReturn(mContentProviderClient).when(mContentResolver).acquireContentProviderClient(
                 Telephony.CellBroadcasts.AUTHORITY_LEGACY);
-        doReturn(mEditor).when(mSharedPreferences).edit();
         doReturn(null).when(mContentProviderClient).call(
                 anyString(), anyString(), anyString(), any());
-        doNothing().when(mEditor).apply();
 
         mCellBroadcastReceiver.migrateSharedPreferenceFromLegacy();
         verify(mContext).getSharedPreferences(anyString(), anyInt());
-        verify(mEditor, never()).putBoolean(anyString(), anyBoolean());
+        assertThat(mFakeSharedPreferences.getValueCount()).isEqualTo(0);
     }
 
     @Test
     public void testSetTestingMode() {
-        boolean isTestingMode = true;
-        setContext();
-        doReturn(mSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
-        doReturn(mEditor).when(mSharedPreferences).edit();
-        doReturn(mEditor).when(mEditor).putBoolean(anyString(), anyBoolean());
-        doReturn(true).when(mEditor).commit();
-
-        mCellBroadcastReceiver.setTestingMode(isTestingMode);
-        verify(mEditor).putBoolean(CellBroadcastReceiver.TESTING_MODE, isTestingMode);
-    }
-
-    @Test
-    public void testIsTestingMode() {
-        doReturn(mSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
-
-        mCellBroadcastReceiver.isTestingMode(mContext);
-        verify(mSharedPreferences).getBoolean("testing_mode", false);
+        assertThat(mCellBroadcastReceiver.isTestingMode(mContext)).isFalse();
+        mCellBroadcastReceiver.setTestingMode(true);
+        assertThat(mCellBroadcastReceiver.isTestingMode(mContext)).isTrue();
     }
 
     @Test
     public void testAdjustReminderInterval() {
-        setContext();
-        doReturn(mSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
-        doReturn("currentInterval").when(mSharedPreferences).getString(
-                CellBroadcastReceiver.CURRENT_INTERVAL_DEFAULT, "0");
+        mFakeSharedPreferences.putString(CellBroadcastReceiver.CURRENT_INTERVAL_DEFAULT,
+                "currentInterval");
         doReturn(mResources).when(mContext).getResources();
+        doReturn(mContext).when(mContext).createConfigurationContext(any());
+        doReturn(mSubscriptionManager).when(mContext).getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
         doReturn("newInterval").when(mResources).getString(
                 R.string.alert_reminder_interval_in_min_default);
-        doReturn(mEditor).when(mSharedPreferences).edit();
-        doReturn(mEditor).when(mEditor).putBoolean(anyString(), anyBoolean());
-        doReturn(true).when(mEditor).commit();
 
         mCellBroadcastReceiver.adjustReminderInterval();
-        verify(mEditor).putString(CellBroadcastReceiver.CURRENT_INTERVAL_DEFAULT, "newInterval");
+        assertThat(mFakeSharedPreferences.getString(
+                CellBroadcastReceiver.CURRENT_INTERVAL_DEFAULT, ""))
+                .isEqualTo("newInterval");
     }
 
     @Test
     public void testEnableLauncherIfNoLauncherActivity() throws
             PackageManager.NameNotFoundException {
-        setContext();
         doReturn(mPackageManager).when(mContext).getPackageManager();
         doReturn(mPackageInfo).when(mPackageManager).getPackageInfo(anyString(), anyInt());
 
@@ -303,7 +361,6 @@
 
     @Test
     public void testEnableLauncherIfEnableTrue() throws PackageManager.NameNotFoundException {
-        setContext();
         doReturn(mPackageManager).when(mContext).getPackageManager();
         doReturn(mPackageInfo).when(mPackageManager).getPackageInfo(anyString(), anyInt());
         doReturn(true).when(mResources)
@@ -324,7 +381,6 @@
 
     @Test
     public void testEnableLauncherIfEnableFalse() throws PackageManager.NameNotFoundException {
-        setContext();
         doReturn(mPackageManager).when(mContext).getPackageManager();
         doReturn(mPackageInfo).when(mPackageManager).getPackageInfo(anyString(), anyInt());
         doReturn(false).when(mResources)
@@ -346,38 +402,34 @@
     @Test
     public void testTryCdmaSetCatergory() {
         boolean enable = true;
-        doReturn(mSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
-        doReturn(mEditor).when(mSharedPreferences).edit();
-        doReturn(mEditor).when(mEditor).putBoolean(anyString(), anyBoolean());
 
         mCellBroadcastReceiver.tryCdmaSetCategory(mContext,
                 CdmaSmsCbProgramData.CATEGORY_CMAS_EXTREME_THREAT, enable);
-        verify(mEditor).putBoolean(
-                CellBroadcastSettings.KEY_ENABLE_CMAS_EXTREME_THREAT_ALERTS, enable);
+        assertThat(mFakeSharedPreferences.getBoolean(
+                CellBroadcastSettings.KEY_ENABLE_CMAS_EXTREME_THREAT_ALERTS, !enable))
+                .isEqualTo(enable);
 
         mCellBroadcastReceiver.tryCdmaSetCategory(mContext,
                 CdmaSmsCbProgramData.CATEGORY_CMAS_SEVERE_THREAT, enable);
-        verify(mEditor).putBoolean(
-                CellBroadcastSettings.KEY_ENABLE_CMAS_SEVERE_THREAT_ALERTS, enable);
+        assertThat(mFakeSharedPreferences.getBoolean(
+                CellBroadcastSettings.KEY_ENABLE_CMAS_SEVERE_THREAT_ALERTS, !enable))
+                .isEqualTo(enable);
 
         mCellBroadcastReceiver.tryCdmaSetCategory(mContext,
                 CdmaSmsCbProgramData.CATEGORY_CMAS_CHILD_ABDUCTION_EMERGENCY, enable);
-        verify(mEditor).putBoolean(
-                CellBroadcastSettings.KEY_ENABLE_CMAS_AMBER_ALERTS, enable);
+        assertThat(mFakeSharedPreferences.getBoolean(
+                CellBroadcastSettings.KEY_ENABLE_CMAS_AMBER_ALERTS, !enable))
+                .isEqualTo(enable);
 
         mCellBroadcastReceiver.tryCdmaSetCategory(mContext,
                 CdmaSmsCbProgramData.CATEGORY_CMAS_TEST_MESSAGE, enable);
-        verify(mEditor).putBoolean(
-                CellBroadcastSettings.KEY_ENABLE_TEST_ALERTS, enable);
+        assertThat(mFakeSharedPreferences.getBoolean(
+                CellBroadcastSettings.KEY_ENABLE_TEST_ALERTS, !enable))
+                .isEqualTo(enable);
     }
 
     @Test
     public void testHandleCdmaSmsCbProgramDataOperationAddAndDelete() {
-        setContext();
-        doReturn(mSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
-        doReturn(mEditor).when(mSharedPreferences).edit();
-        doReturn(mEditor).when(mEditor).putBoolean(anyString(), anyBoolean());
-
         CdmaSmsCbProgramData programData = new CdmaSmsCbProgramData(
                 CdmaSmsCbProgramData.OPERATION_ADD_CATEGORY,
                 CdmaSmsCbProgramData.CATEGORY_CMAS_EXTREME_THREAT,
@@ -396,11 +448,6 @@
 
     @Test
     public void testHandleCdmaSmsCbProgramDataOprationClear() {
-        setContext();
-        doReturn(mSharedPreferences).when(mContext).getSharedPreferences(anyString(), anyInt());
-        doReturn(mEditor).when(mSharedPreferences).edit();
-        doReturn(mEditor).when(mEditor).putBoolean(anyString(), anyBoolean());
-
         CdmaSmsCbProgramData programData = new CdmaSmsCbProgramData(
                 CdmaSmsCbProgramData.OPERATION_CLEAR_CATEGORIES,
                 CdmaSmsCbProgramData.CATEGORY_CMAS_PRESIDENTIAL_LEVEL_ALERT,
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSearchIndexableProviderTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSearchIndexableProviderTest.java
index 7cb633c..deb4189 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 @@
         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());
@@ -69,6 +70,18 @@
         doReturn(false).when(mResources).getBoolean(anyInt());
         Cursor cursor = mSearchIndexableProvider.queryNonIndexableKeys(new String[]{""});
 
-        assertThat(cursor.getCount()).isEqualTo(9);
+        //KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE
+        //KEY_ENABLE_TEST_ALERTS
+        //KEY_ENABLE_STATE_LOCAL_TEST_ALERTS
+        //KEY_ENABLE_PUBLIC_SAFETY_MESSAGES
+        //KEY_ENABLE_EMERGENCY_ALERTS
+        //KEY_ENABLE_CMAS_AMBER_ALERTS
+        //KEY_ENABLE_AREA_UPDATE_INFO_ALERTS
+        //KEY_ENABLE_CMAS_AMBER_ALERTS
+        //KEY_ENABLE_CMAS_SEVERE_THREAT_ALERTS
+        //KEY_ENABLE_CMAS_EXTREME_THREAT_ALERTS
+        //KEY_ENABLE_ALERT_SPEECH
+        //KEY_ENABLE_CMAS_PRESIDENTIAL_ALERTS
+        assertThat(cursor.getCount()).isEqualTo(10);
     }
 }
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastServiceTestCase.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastServiceTestCase.java
index 7c2c1bd..7609829 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastServiceTestCase.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastServiceTestCase.java
@@ -16,6 +16,7 @@
 
 package com.android.cellbroadcastreceiver.unit;
 
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.doReturn;
@@ -25,8 +26,10 @@
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.media.AudioManager;
+import android.os.SystemClock;
 import android.os.Vibrator;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionInfo;
@@ -43,6 +46,7 @@
 import org.mockito.MockitoAnnotations;
 
 import java.util.Arrays;
+import java.util.function.BooleanSupplier;
 
 public abstract class CellBroadcastServiceTestCase<T extends Service> extends ServiceTestCase<T> {
 
@@ -62,6 +66,8 @@
     protected TelephonyManager mMockedTelephonyManager;
     @Mock
     protected Vibrator mMockedVibrator;
+    @Mock
+    protected SharedPreferences mMockedSharedPreferences;
 
     MockedServiceManager mMockedServiceManager;
 
@@ -73,11 +79,20 @@
         super(serviceClass);
     }
 
-    protected static void waitForMs(long ms) {
-        try {
-            Thread.sleep(ms);
-        } catch (InterruptedException e) {
+    protected static void waitFor(BooleanSupplier condition) {
+        if (condition.getAsBoolean()) {
+            return;
         }
+        for (int i = 0; i < 50; i++) {
+            SystemClock.sleep(100);
+            if (condition.getAsBoolean()) {
+                return;
+            }
+        }
+    }
+
+    protected void enablePreference(String pref) {
+        doReturn(true).when(mMockedSharedPreferences).getBoolean(eq(pref), anyBoolean());
     }
 
     private class TestContextWrapper extends ContextWrapper {
@@ -125,6 +140,11 @@
             }
             return super.getSystemService(name);
         }
+
+        @Override
+        public SharedPreferences getSharedPreferences(String name, int mode) {
+            return mMockedSharedPreferences;
+        }
     }
 
     @Before
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSettingsTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSettingsTest.java
index b7fc744..56f57bb 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSettingsTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastSettingsTest.java
@@ -22,9 +22,11 @@
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Looper;
 import android.os.RemoteException;
 import android.support.test.uiautomator.UiDevice;
 
+import androidx.preference.PreferenceManager;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.FlakyTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -50,7 +52,7 @@
     }
 
     @Before
-    public void setUp() {
+    public void setUp() throws Exception {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mContext = mInstrumentation.getTargetContext();
         mDevice = UiDevice.getInstance(mInstrumentation);
@@ -92,6 +94,34 @@
         }
     }
 
+    @Test
+    public void testResetAllPreferences() throws Throwable {
+        Looper.prepare();
+        // set a few preferences so we can verify they are reset to the default
+        PreferenceManager.getDefaultSharedPreferences(mContext).edit()
+                .putBoolean(CellBroadcastSettings.KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE, true)
+                .putBoolean(CellBroadcastSettings.KEY_ENABLE_ALERT_VIBRATE, false).apply();
+        assertTrue("receive_cmas_in_second_language was not set to true",
+                PreferenceManager.getDefaultSharedPreferences(mContext)
+                        .getBoolean(CellBroadcastSettings.KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE,
+                                false));
+        assertFalse("enable_alert_vibrate was not set to false",
+                PreferenceManager.getDefaultSharedPreferences(mContext)
+                        .getBoolean(CellBroadcastSettings.KEY_ENABLE_ALERT_VIBRATE, true));
+
+        // see preferences.xml for default values.
+        // receive_cmas_in_second_language is false by default
+        // enable_alert_vibrate is true by default
+        CellBroadcastSettings.resetAllPreferences(mContext);
+
+        assertFalse("receive_cmas_in_second_language was not reset to the default (false)",
+                PreferenceManager.getDefaultSharedPreferences(mContext)
+                .getBoolean(CellBroadcastSettings.KEY_RECEIVE_CMAS_IN_SECOND_LANGUAGE, true));
+        assertTrue("enable_alert_vibrate was not reset to the default (true)",
+                PreferenceManager.getDefaultSharedPreferences(mContext)
+                .getBoolean(CellBroadcastSettings.KEY_ENABLE_ALERT_VIBRATE, false));
+    }
+
     public void waitUntilDialogOpens(Runnable r, long maxWaitMs) {
         long waitTime = 0;
         while (waitTime < maxWaitMs) {
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastTest.java
index af387c2..54c6329 100644
--- a/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastTest.java
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/CellBroadcastTest.java
@@ -26,10 +26,10 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.util.SparseArray;
 
-import com.android.cellbroadcastreceiver.unit.MockedServiceManager;
 import com.android.internal.telephony.ISub;
 
 import org.mockito.Mock;
@@ -48,6 +48,8 @@
     @Mock
     CarrierConfigManager mCarrierConfigManager;
     @Mock
+    TelephonyManager mTelephonyManager;
+    @Mock
     Resources mResources;
     @Mock
     ISub.Stub mSubService;
@@ -58,19 +60,29 @@
         // A hack to return mResources from static method
         // CellBroadcastSettings.getResources(context).
         doReturn(mSubService).when(mSubService).queryLocalInterface(anyString());
+        doReturn(mSubService).when(mSubService).asBinder();
         doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mSubService).getDefaultSubId();
         doReturn(SubscriptionManager.INVALID_SUBSCRIPTION_ID).when(mSubService).getDefaultSmsSubId();
         mMockedServiceManager = new MockedServiceManager();
         mMockedServiceManager.replaceService("isub", mSubService);
+        TelephonyManager.disableServiceHandleCaching();
+        SubscriptionManager.clearCaches();
+        SubscriptionManager.disableCaching();
+
         initContext();
     }
 
     private void initContext() {
         doReturn(mCarrierConfigManager).when(mContext)
                 .getSystemService(eq(Context.CARRIER_CONFIG_SERVICE));
+        doReturn(Context.TELEPHONY_SERVICE).when(mContext).getSystemServiceName(
+                TelephonyManager.class);
+        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
         doReturn(mResources).when(mContext).getResources();
         doReturn(mContext).when(mContext).getApplicationContext();
         doReturn(new String[]{""}).when(mResources).getStringArray(anyInt());
+        doReturn(TelephonyManager.SIM_STATE_LOADED).when(mTelephonyManager)
+                .getSimApplicationState(anyInt());
     }
 
     void carrierConfigSetStringArray(int subId, String key, String[] values) {
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/unit/FakeSharedPreferences.java b/tests/unit/src/com/android/cellbroadcastreceiver/unit/FakeSharedPreferences.java
new file mode 100644
index 0000000..d64a0f4
--- /dev/null
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/unit/FakeSharedPreferences.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.cellbroadcastreceiver.unit;
+
+import android.content.SharedPreferences;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Class to create fake SharedPreferences.
+ */
+public class FakeSharedPreferences implements SharedPreferences, SharedPreferences.Editor {
+    private HashMap<String, Object> mValues = new HashMap<String, Object>();
+
+    public int getValueCount() {
+        return mValues.size();
+    }
+
+    @Override
+    public Editor edit() {
+        return this;
+    }
+
+    @Override
+    public boolean contains(String key) {
+        return mValues.containsKey(key);
+    }
+
+    @Override
+    public Map<String, ?> getAll() {
+        return new HashMap<String, Object>(mValues);
+    }
+
+    @Override
+    public boolean getBoolean(String key, boolean defValue) {
+        if (mValues.containsKey(key)) {
+            return ((Boolean) mValues.get(key)).booleanValue();
+        }
+        return defValue;
+    }
+
+    @Override
+    public float getFloat(String key, float defValue) {
+        if (mValues.containsKey(key)) {
+            return ((Float) mValues.get(key)).floatValue();
+        }
+        return defValue;
+    }
+
+    @Override
+    public int getInt(String key, int defValue) {
+        if (mValues.containsKey(key)) {
+            return ((Integer) mValues.get(key)).intValue();
+        }
+        return defValue;
+    }
+
+    @Override
+    public long getLong(String key, long defValue) {
+        if (mValues.containsKey(key)) {
+            return ((Long) mValues.get(key)).longValue();
+        }
+        return defValue;
+    }
+
+    @Override
+    public String getString(String key, String defValue) {
+        if (mValues.containsKey(key)) return (String) mValues.get(key);
+        else return defValue;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Set<String> getStringSet(String key, Set<String> defValues) {
+        if (mValues.containsKey(key)) {
+            return (Set<String>) mValues.get(key);
+        }
+        return defValues;
+    }
+
+    @Override
+    public void registerOnSharedPreferenceChangeListener(
+            OnSharedPreferenceChangeListener listener) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void unregisterOnSharedPreferenceChangeListener(
+            OnSharedPreferenceChangeListener listener) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Editor putBoolean(String key, boolean value) {
+        mValues.put(key, Boolean.valueOf(value));
+        return this;
+    }
+
+    @Override
+    public Editor putFloat(String key, float value) {
+        mValues.put(key, value);
+        return this;
+    }
+
+    @Override
+    public Editor putInt(String key, int value) {
+        mValues.put(key, value);
+        return this;
+    }
+
+    @Override
+    public Editor putLong(String key, long value) {
+        mValues.put(key, value);
+        return this;
+    }
+
+    @Override
+    public Editor putString(String key, String value) {
+        mValues.put(key, value);
+        return this;
+    }
+
+    @Override
+    public Editor putStringSet(String key, Set<String> values) {
+        mValues.put(key, values);
+        return this;
+    }
+
+    @Override
+    public Editor remove(String key) {
+        mValues.remove(key);
+        return this;
+    }
+
+    @Override
+    public Editor clear() {
+        mValues.clear();
+        return this;
+    }
+
+    @Override
+    public boolean commit() {
+        return true;
+    }
+
+    @Override
+    public void apply() {
+        commit();
+    }
+}