Merge "Increase string limit of full volume tille and summary."
am: cc70543949  -s ours

Change-Id: I13e19967573ac3bd3300199c064617d480d91556
diff --git a/Android.mk b/Android.mk
index 3bc74ee..db00900 100644
--- a/Android.mk
+++ b/Android.mk
@@ -23,6 +23,7 @@
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+include frameworks/base/packages/SettingsLib/common.mk
 include $(BUILD_PACKAGE)
 
 # This finds and builds the test apk as well, so a single make does both.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 61b11ce..e7407ac 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,6 +30,7 @@
     <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.RECEIVE_BOOT_COMPLETED"/>
 
     <application android:name="CellBroadcastReceiverApp"
             android:label="@string/app_label"
@@ -124,6 +125,7 @@
             <intent-filter>
                  <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.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
deleted file mode 100644
index 741435e..0000000
--- a/res/layout/preference_category_material_settings.xml
+++ /dev/null
@@ -1,66 +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.
-  -->
-
-<!-- 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/values-af/strings.xml b/res/values-af/strings.xml
index 6ae4925..4f0a41b 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Seluitsendings"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Seluitsending-instellings"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Noodwaarskuwings"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Seluitsending-instellings is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Daar is geen aktiewe berigte in jou area nie. Jy kan die Berigte-instellings verander in die Instellings-kieslysopsie."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Daar is geen aktiewe opletberigte in jou area nie. Jy kan die Opletberigte-instellings verander in die Instellings-kieslysopsie."</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>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Noodberig (diensverskaffer)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Noodberig"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Uitsaaiboodskappe"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Noodberig-instellings"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Waarskuwings"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Uitsaaiboodskappe"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Skakel waarskuwings aan"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Wys noodberig-uitsendings"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Waarskuwingonthounota"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Laat waarskuwings toe"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Ontvang noodkennisgewings"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Waarskuwingonthounota-klank"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Sê waarskuwingboodskap hardop"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Gebruik teks-na-spraak om \'n noodberigboodskap hardop te sê"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS-instellings"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Wys ETWS-toetsuitsendings"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Wys toetsuitsendings vir aardbewing-tsoenami-waarskuwingstelsel"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Wys uiterste bedreigings"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Wys waarskuwings vir uiterste bedreigings vir lewe en eiendom"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Wys ernstige bedreigings"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Wys waarskuwings vir ernstige bedreigings vir lewe en eiendom"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Wys AMBER-berigte"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Toon kinderontvoerings se noodbulletins (AMBER-berig)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Wys CMAS-toetsuitsendings"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Vertoon toetsuitsendings vir Komersiële Mobiele Waarskuwingstelsel (CMAS)"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Noodwaarskuwing-geskiedenis"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Waarskuwingvoorkeure"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-toetsuitsendings"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Toetsuitsendings vir aardbewing-tsoenami-waarskuwingstelsel (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Uiterste bedreigings"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Uiterste bedreigings vir lewe en eiendom"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ernstige bedreigings"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ernstige bedreigings vir lewe en eiendom"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-berigte"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Noodbulletins oor kinderontvoering"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-toetsuitsendings"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Toetsuitsendings vir Kommersiële Mobiele Waarskuwingstelsel (CMAS)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibreer"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Gebruik volle volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignoreer ander volume- en Moenie Steur Nie-voorkeure"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Area-opdateringuitsendings"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Wys opdateringinligting in SIM-status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area-opdateringuitsendings"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Wys opdateringinligting in SIM-status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Ontwikkelaaropsies"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Opletberig-kategorie:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisies"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 3e76bda..41bccef 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"የስልክ ስርጭቶች"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"የተንቀሳቃሽ ስልክ ስርጭት ቅንብሮች"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"አስቸኳይ ማንቂያዎች"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"የተንቀሳቃሽ ስልክ ስርጭት ቅንብሮች ለዚህ ተጠቃሚ አይገኙም"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"እሺ"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"በእርስዎ አካባቢ ምንም የነቁ ማንቂያዎች የሉም። የቅንብሮችን ምናሌ አማራጭ በመጠቀም የማንቂያ ቅንብሮችን መለወጥ ይችላሉ።"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"የአደጋ ጊዜ ማንቂያ(ከዋኝ)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"የአደጋ ጊዜ ማንቂያ"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"መልዕክቶችን አሰራጭ"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"የአደጋ ጊዜ ማንቂያ ቅንብሮች"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"ማንቂያዎች"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"መልእክቶችን አሰራጭ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"ማሳወቂያዎች አሰነሳ"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"የአደጋ ጊዜ ማስጠንቀቂያ ስርጭቶችን አሳይ"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"የማንቂያ አስታዋሽ"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"ማንቂያዎችን ፍቀድ"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"የአስቸኳይ ጊዜ ማሳወቂያዎችን ይቀበሉ"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"የማንቂያ አስታዋሽ ድምጽ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"የማስጠንቀቂያ መልዕክት ተናገር"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"የአደጋ ጊዜ ማስጠንቀቂያ መልዕክቶችን ለመናገር የፅሁፍ-ወደ- ንግግርን ተጠቀም"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"የETWS ቅንብሮች"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS የሙከራ ስርጭቶችን አሳይ"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"ለመሬት መንቀጥቀጥ ሱናሚ ማስጠንቀቂያ ስርዓት የሙከራ ስርጭቶችን አሳይ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"ከባድ አደጋዎችን አሳይ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"የሕይወት እና ንብረት ከባድ አደጋዎችን ማንቂያዎች አሳይ"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ሃይለኛ አደጋዎችን አሳይ"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"ለሕይወት እና ንብረት ሃይለኛ አደጋዎችን ማንቂያዎች አሳይ"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"የእገታ ማንቂያዎች አሳይ"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"የህፃናት እገታ አደጋ ጥሪዎችን ዜና አሳይ (የእገታ ማንቂያዎች)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS የሙከራ ስርጭቶችን አሳይ"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"ለንግድ ተንቀሳቃሽ የማንቂያ ስርዓት የሙከራ ስርጭቶችን አሳይ"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"የአደጋ ጊዜ ማንቂያ ታሪክ"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"የማንቂያ ምርጫዎች"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"የETWS ሙከራ ስርጭቶች"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"ለመሬት መንቀጥቀጥ ሱናሚ ማስጠንቀቂያ ስርዓት የሙከራ ስርጭቶች"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"እጅግ ከፍተኛ አደጋዎች"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"በህይወት እና ንብረት ላይ የተጋረጡ እጅግ ከፍተኛ አደጋዎች"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"የከፉ አደጋዎች"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"በህይወት እና ንብረት ላይ የተጋረጡ የከፉ አደጋዎች"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"የAMBER ማንቂያዎች"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"የልጅ ጠለፋ አደጋ ጊዜ ማስታወቂያዎች"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"የCMAS ሙከራ ስርጭቶች"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"የንግድ ሞባይል ማንቂያ ስርዓት የሙከራ ስርጭቶች"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ንዘር"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ሙሉ ድምጽ ተጠቀም"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ሌላ ድምጽ እና የአትረብሽ ምርጫዎችን ችላ በል"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"የአካባቢ ዝማኔ ስርጭቶች"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"በሲም ሁኔታ ውስጥ የዝማኔ መረጃን አሳይ"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"የአካባቢ ዝማኔ ስርጭቶች"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"በሲም ሁኔታ ውስጥ የዝማኔ መረጃን አሳይ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"የገንቢዎች አማራጮች"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"የማንቂያ ምድብ፦"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ጂኦፊዚካል"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8a013dd..f249589 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell Broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"إعدادات بث الشبكة"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"تنبيهات الطوارئ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"إعدادات البث الخلوي غير متوفّرة لهذا المستخدم"</string>
-    <string name="button_dismiss" msgid="1234221657930516287">"موافق"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"لا تتوفر اشعارات نشطة في منطقتك. يمكنك تغيير إعدادات التنبيه باستخدام خيار قائمة الإعدادات."</string>
+    <string name="button_dismiss" msgid="1234221657930516287">"حسنًا"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"لا تتوفّر إشعارات نشطة في منطقتك. يمكنك تغيير إعدادات التنبيه باستخدام خيار قائمة الإعدادات."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"الإعدادات"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"حذف مجموعات البث"</string>
     <string name="message_options" msgid="3178489901903589574">"خيارات الرسائل"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"إنذار الطوارئ (مشغل شبكة الجوال)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"تنبيه الطوارئ"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"رسائل البث"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"إعدادات اشعارات الطوارئ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"التنبيهات"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"رسائل البث"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"تشغيل الإشعارات"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"عرض مجموعات بث إشعارات الطوارئ"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"تذكير التنبيه"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"السماح بالتنبيهات"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"تلقّي إشعارات الطوارئ"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"صوت تذكير التنبيه"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"نطق رسالة التنبيه"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"استخدام ميزة تحويل النص إلى كلام لنطق رسائل اشعارات الطوارئ"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"‏إعدادات ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"‏عرض نشرات اختبار ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"عرض مجموعات البث التجريبية لنظام التحذير المبكر من موجات تسونامي عقب الزلازل"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"عرض المخاطر القصوى"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"عرض إشعارات بأشدّ المخاطر على الحياة والممتلكات"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"عرض المخاطر البالغة"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"عرض إشعارات بالمخاطر الكبيرة على الحياة والممتلكات"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"‏عرض إشعارات اختطاف الأطفال (AMBER)"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"‏عرض نشرات طوارئ اختطاف طفل (نظام إنذار اختطاف الأطفال AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"‏عرض نشرات اختبار CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"عرض نشرات الاختبار في نظام التنبيه التجاري عبر الجوال"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"سجلّ تنبيهات حالات الطوارئ"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"تفضيلات التنبيه"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"‏مجموعات البث التجريبية في ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"مجموعات البث التجريبية لنظام التحذير المبكر من موجات تسونامي عقب الزلازل"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"التهديدات الشديدة"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"التهديدات الشديدة للحياة والممتلكات"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"التهديدات الخطيرة"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"التهديدات الخطيرة للحياة والممتلكات"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏تنبيهات AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"نشرات طوارئ اختطاف الأطفال"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"‏مجموعات البث التجريبية في CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"مجموعات البث التجريبية في نظام التنبيهات عبر شركات الجوّال التجارية"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"اهتزاز"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"استخدام مستوى الصوت الكامل"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"تجاهل التفضيلات الأخرى لمستوى الصوت وخيار عدم الإزعاج"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"عمليات بث معلومات التحديث المتعلقة بالمنطقة"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"‏إظهار معلومات التحديث في حالة SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"عمليات بث معلومات التحديث المتعلقة بالمنطقة"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"‏إظهار معلومات التحديث في حالة SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"خيارات مطور البرامج"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"فئة التنبيه:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"جيوفيزيائي"</string>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 768626c..e16c965 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Şəbəkə Yayımları"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Şəbəkə Yayım ayarları"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Həyəcan siqnalları"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Şəbəkə Yayım ayarları bu istifadəçi üçün əlçatımlı deyil"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Sahənizdə aktiv siqnallar yoxdur. Ayarlar menyu seçimlərini istifadə edərək Siqnal ayarlarını dəyişə bilərsiniz."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Həyəcan siqnalı (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Həyəcan Siqnalları"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Yayım mesajları"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Həyəcan siqnalı ayarları"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Siqnallar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Yayım mesajları"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Bildirişləri aktivləşdirin"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Təcili siqnal yayımlarını göstər"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Siqnal xatırladıcısı"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Siqnallara icazə verin"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Mühüm bildirişlər əldə edin"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Siqnal xatırlatma səsi"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Siqnal mesajını səsləndirin"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Həyəcan siqnalı mesajlarını danışmaq üçün mətnin səsləndirilməsini istifadə edin"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS ayarları"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS test yayımlarını göstər"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Zəlzələ Sunami Xəbərdarlıq Sistemi üçün test yayımını göstər"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Şiddətli təhlükələri göstər"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Həyata və mülkiyyətə şiddətli təhlükə üçün siqnalları göstər"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Ağır təhlükələri göstər"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Həyata və mülkiyyətə ağır təhlükə üçün siqnalları göstər"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"KƏHRƏBA siqnalları göstər"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Uşaq qaçırma bülletenlərini göstərin (KƏHRƏBA siqnal)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS test yayımlarını göstər"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Ticari Mobil Siqnal Sistemi üçün test yayımlarını göstər"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Təcili siqnal tarixçəsi"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Siqnal tərcihləri"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ZSXS test yayımları"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Zəlzələ Sunami Xəbərdarlıq Sistemi üçün test yayımı"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ciddi təhlükə"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Həyat və mülkiyyət üçün ciddi təhlükələr"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Dəhşətli təhlükə"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Həyat və mülkiyyət üçün dəhşətli təhlükə"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"KƏHRƏBAYI siqnallar"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Uşaq qaçırma həyəcan siqnalı bülletenləri"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"TMSS test yayımları"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Ticari Mobil Siqnal Sistemi üçün test yayımları"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrasiya"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Tam səs istifadəsi"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Digər səsi və \"Narahat etməyin\" tərcihlərini iqnor edin"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Ərazi yeniləmə yayımı"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM statusunda güncəlləmə məlumatını göstərin"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Ərazi yeniləmə yayımı"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM statusunda güncəlləmə məlumatını göstərin"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Gəlişdirici seçimləri"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Siqnal Kateqoriyası:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofiziki"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0b39685..356ac81 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Emitovanja operatera"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Podešavanja emitovanja operatera"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Hitna obaveštenja"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Podešavanja za poruke za mobilne uređaje na lokalitetu nisu dostupna za ovog korisnika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Potvrdi"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nema aktivnih upozorenja u vašoj oblasti. Podešavanja upozorenja možete da promenite pomoću opcije menija Podešavanja."</string>
@@ -44,24 +44,27 @@
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Obaveštenje o hitnom slučaju (vežba)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Obaveštenje o hitnom slučaju (operater)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Obaveštenje o hitnom slučaju"</string>
-    <string name="cb_other_message_identifiers" msgid="7083176204482365281">"Emitovanje operatera"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Podešavanja obaveštenja o hitnom slučaju"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Uključi obaveštenja"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Prikaži emitovanja obaveštenja o hitnom slučaju"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Podsetnik za obaveštenja"</string>
+    <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Poruke o emitovanju"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Obaveštenja"</string>
+    <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Poruke o emitovanju"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Dozvoli obaveštenja"</string>
+    <!-- no translation found for enable_emergency_alerts_summary (8171013771243907245) -->
+    <skip />
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Zvuk podsetnika za obaveštenja"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovorite poruku obaveštenja"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Koristite opciju pretvaranja teksta u govor za izgovaranje poruka obaveštenja o hitnom slučaju"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS podešavanja"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Prikaži ETWS probna emitovanja"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Prikaži probna emitovanja za sistem upozorenja o zemljotresu i cunamiju"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Prikaži ekstremne opasnosti"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Prikazuje upozorenja o ekstremnoj opasnosti po život i svojinu"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Prikaži ozbiljne pretnje"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Prikazuje upozorenja o ozbiljnoj opasnosti po život i svojinu"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Prikaži AMBER upozorenja"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Prikazuje vanredne objave u vezi sa otmicom deteta (AMBER upozorenje)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Prikaži CMAS probna emitovanja"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Prikazuje probne prenose za Komercijalni sistem upozorenja za mobilne uređaje (CMAS)"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS probna emitovanja"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Probna emitovanja za sistem upozorenja o zemljotresu i cunamiju (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ekstremne opasnosti"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ekstremna opasnost po život i imovinu"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ozbiljne opasnosti"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ozbiljna opasnost po život i imovinu"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER obaveštenja"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Objave u vezi sa otmicom deteta"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS probna emitovanja"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Probna emitovanja za Komercijalni sistem upozorenja za mobilne uređaje (CMAS)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibriraj"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Koristi najveću jačinu zvuka"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemaruje druga podešavanja za Jačinu zvuka i Ne uznemiravaj"</string>
@@ -107,6 +110,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Trenutno primate upozorenja o hitnim slučajevima. Želite li da nastavite da ih primate?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Da"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"He"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Istorija obaveštenja o hitnim slučajevima"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jedanput"</item>
     <item msgid="9097229303902157183">"Svaka 2 minuta"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 584e83b..f1b8797 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Мабільныя вяшчанні"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Настройкі мабільнага вяшчання"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Надзвычайныя абвесткі"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Налады мабільнага вяшчання недаступныя для гэтага карыстальніка"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ОК"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Няма актыўных абвестак у вашым раёне. Вы можаце змяніць налады абвестак, выкарыстоўваючы меню налад."</string>
@@ -44,24 +44,27 @@
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Аварыйная абвестка (практыкаванне)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Аварыйная абвестка (аператар)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Аварыйная абвестка"</string>
-    <string name="cb_other_message_identifiers" msgid="7083176204482365281">"Мабільнае вяшчанне"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Налады аварыйных абвестак"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Уключыць апавяшчэннi"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Паказаць вяшчанні аварыйнага абвяшчэння"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Напамін з абвяшчэннем"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Скажыце паведамлен. абвяшчэння"</string>
+    <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Паведамленні рассылкі"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Абвесткі"</string>
+    <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Паведамленні рассылкі"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Дазволіць дасылаць абвесткі"</string>
+    <!-- no translation found for enable_emergency_alerts_summary (8171013771243907245) -->
+    <skip />
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Гукавы сігнал напамінаў"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Прагаворваць апавяшчэнні"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Выкарыстоўваць тэкст-у-мову, каб прагаворваць аварыйныя апавяшчэнні"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Налады ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Паказаць тэставыя перадачы ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Адлюстраванне выпрабавальных вяшчанняў для сістэмы папярэджання аб землятрусах і цунамі"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Паказаць крайнія пагрозы"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Паказаць абвесткі аб экстрэмальных пагрозах для жыцця і маёмасці"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Паказаць сур\'ёзныя пагрозы"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Паказаць абвесткі аб сур\'ёзных пагрозах для жыцця і маёмасці"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Паказаць АРАНЖАВЫЯ абвесткi"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Паказаць надзвычайныя бюлетэні эвакуацыі дзяцей (аранжавая ступень пагрозы)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Паказаць тэставыя перадачы CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Паказаць тэставыя перадачы для камерцыйнай мабільнай сістэмы абвяшчэння"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Гісторыя аварыйных абвестак"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Параметры абвестак"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Тэставыя рассылкі ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Тэставыя рассылкі сістэмы папярэджання аб землятрусах і цунамі"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Надзвычайныя пагрозы"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Надзвычайныя пагрозы для жыцця і маёмасці"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Сур\'ёзныя пагрозы"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Сур\'ёзная пагрозы для жыцця і маёмасці"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Абвесткі сістэмы AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Апавяшчэнні пра выкраданне дзяцей"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Тэставыя рассылкі CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Тэставыя рассылкі камерцыйнай мабільнай сістэмы абвяшчэння"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вібрацыя"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Уключыць на поўную гучнасць"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ігнараваць іншыя гукі і параметры рэжыму \"Не турбаваць\""</string>
@@ -103,10 +106,11 @@
     <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="4370292554938680862">"Паказаць дыялогавае вакно выхада пасля адлюстравання першага CMAS (акрамя прэзідэнцкага папярэджання)."</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Паказаць дыялогавае вакно выхада"</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Паказваць вакно адключэння"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Зараз вы атрымліваеце надзвычайныя абвесткі. Працягваць атрымліваць іх?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Так"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Не"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Гісторыя аварыйных абвестак"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Адзiн раз"</item>
     <item msgid="9097229303902157183">"Кожныя 2 хвіліны"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b9d0b3a..00f32c1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Клетъчни излъчвания"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Настройки на клетъчното излъчване"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Сигнали при спешни случаи"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Настройките за клетъчно излъчване не са налице за този потребител"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"В района ви няма активни сигнали. Можете да промените настройките за тях посредством опцията от менюто „Настройки“."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Сигнал при спешни случаи (оператор)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Сигнал при спешни случаи"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Съобщения за излъчване"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Настройки за сигналите при спешни случаи"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Сигнали"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Съобщения за излъчване"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Включване на известията"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Показване на излъчв. на сигнал при спешни случаи"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Напомняне за сигнал"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Разрешаване на сигналите"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Получаване на известия при спешни случаи"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Звук за напомняния за сигнали"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Съобщ. за сигнала: Изговаряне"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Използване на синтезиран говор за съобщенията за сигнали при спешни случаи"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Настройки за СПЗЦ"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Показване на тест. излъчвания за СПЗЦ"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Показване на тестовите излъчвания на системата за предупреждение за земетресения и цунами"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Показване на извънредни заплахи"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Показване на сигналите за извънредни заплахи за живота и собствеността"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Показване на сериозни заплахи"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Показване на сигналите за сериозни заплахи за живота и собствеността"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Показване на сигналите за изчезнали деца"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Показване на спешните бюлетини за изчезнали деца (сигнал за изчезнало дете)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Показване на тест. излъчвания за ССММ"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Показване на тестови излъчвания за системата за сигнали чрез мобилните мрежи"</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">"Тестови излъчвания за СПЗЦ"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Тестови излъчвания за системата за предупреждение за земетресения и цунами"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Извънредни заплахи"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Извънредни заплахи за живота и собствеността"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Сериозни заплахи"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Сериозни заплахи за живота и собствеността"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Сигнали за изчезнали деца"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Бюлетини за спешни случаи при отвличане на дете"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Тест. излъчвания за с-мата за сигнали чрез моб. мрежи"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Тестови излъчвания за системата за сигнали чрез мобилните мрежи"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вибриране"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Ползв. на пълната сила на звука"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Пренебр. на другите предпоч. за силата на звука и режима „Не безпокойте“"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Излъчвания на актуализации по райони"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Показване на информация за актуализациите в състоянието на SIM картата"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Излъчвания на актуализации по райони"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Показване на информация за актуализациите в състоянието на SIM картата"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Опции на програмиста"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категория на сигнала:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизични"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index c1c6b05..ac53af4 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -17,24 +17,24 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"সেল সম্প্রচারগুলি"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"সেল সম্প্রচার সেটিংস"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"জরুরি সতর্কতা"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"সেল ব্রডকাস্ট সেটিংস এই ব্যবহারকারীর জন্য উপলব্ধ নয়"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ঠিক আছে"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"আপনার এলাকায় কোনো সক্রিয় সতর্কতা নেই। সেটিংস মেনু বিকল্প ব্যবহার করে আপনি সতর্কতা সেটিংস পরিবর্তন করতে পারেন।"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"আপনার এলাকায় কোনও সক্রিয় সতর্কতা নেই। সেটিংস মেনু বিকল্প ব্যবহার করে আপনি সতর্কতা সেটিংস পরিবর্তন করতে পারেন।"</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="message_options" msgid="3178489901903589574">"মেসেজ বিকল্পগুলি"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"বিশদ বিবরণ দেখুন"</string>
     <string name="menu_delete" msgid="128380070910799366">"সম্প্রচার মুছে দিন"</string>
     <string name="view_details_title" msgid="1780427629491781473">"সতর্কতার বিশদ বিবরণ"</string>
     <string name="confirm_delete_broadcast" msgid="2540199303730232322">"এই সম্প্রচারটি মুছবেন?"</string>
-    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"প্রাপ্ত সমস্ত সম্প্রচার বার্তা মুছে দিন?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"প্রাপ্ত সমস্ত সম্প্রচার মেসেজ মুছে দিন?"</string>
     <string name="button_delete" msgid="4672451757925194350">"মুছুন"</string>
     <string name="button_cancel" msgid="7479958360523246140">"বাতিল করুন"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"ভূমিকম্প সতর্কবার্তা"</string>
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"সুনামি সতর্কবার্তা"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"ভূমিকম্প ও সুনামির সতর্কবার্তা"</string>
-    <string name="etws_test_message" msgid="8447820262584381894">"ETWS পরীক্ষা বার্তা"</string>
+    <string name="etws_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>
@@ -44,31 +44,32 @@
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"জরুরী সতর্কতা (ব্যায়াম)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"জরুরী সতর্কতা (অপারেটর)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"জরুরী সতর্কতা"</string>
-    <string name="cb_other_message_identifiers" msgid="5790068194529377210">"সম্প্রচারিত বার্তা"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"জরুরী সতর্কতা সেটিংস"</string>
-    <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"সম্প্রচারিত বার্তা"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"বিজ্ঞপ্তি চালু করুন"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"জরুরী সতর্কতা সম্প্রচারগুলি প্রদর্শন করুন"</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="356086178962268831">"জরুরী সতর্কতা বার্তা বলতে পাঠ্য থেকে ভাষ্য ব্যবহার করুন"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS সেটিংস"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS পরীক্ষা সম্প্রচারগুলি দেখুন"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"ভূমিকম্প সুনামি সতর্কবার্তা সিস্টেমর জন্য পরীক্ষা সম্প্রচারগুলি দেখুন"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"চরম হুমকিগুলি দেখুন"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"জীবন ও সম্পত্তির উপর চরম হুমকিগুলির জন্য সতর্কতা বার্তা দেখুন"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"গুরুতর হুমকিগুলি দেখুন"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"জীবন ও সম্পত্তির উপর গুরুতর হুমকিগুলির জন্য সতর্কতা বার্তা দেখুন"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER সতর্কতাগুলি দেখুন"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"শিশু অপহরণের জরুরী বুলেটিনগুলি প্রদর্শন করুন (AMBER সতর্কতা)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"ETWS পরীক্ষা সম্প্রচারগুলি দেখুন"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"বাণিজ্যিক মোবাইল সতর্কতা সিস্টেমের জন্য পরীক্ষা সম্প্রচারগুলি দেখুন"</string>
-    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"কম্পন"</string>
+    <string name="cb_other_message_identifiers" msgid="5790068194529377210">"সম্প্রচারিত মেসেজ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"সতর্কতা"</string>
+    <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"সম্প্রচারিত মেসেজ"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"অ্যালার্টের অনুমতি দিন"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"জরুরি অবস্থার বিজ্ঞপ্তি পান"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"সতর্কতা মনে করিয়ে দেওয়ার সাউন্ড"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"সতর্কতা মেসেজ বলুন"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"জরুরী সতর্কতা মেসেজ বলতে পাঠ্য থেকে ভাষ্য ব্যবহার করুন"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"জরুরি সতর্কতার ইতিহাস"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"অ্যালার্টের পছন্দগুলি"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS পরীক্ষামূলক সম্প্রচার"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"ভূমিকম্প সুনামি অ্যালার্ট সিস্টেমের জন্য পরীক্ষামূলক সম্প্রচারগুলি দেখুন"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"চরম আশঙ্কা"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"জীবন ও সম্পদহানির চরম আশঙ্কা"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"গুরুতর আশঙ্কা"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"জীবন ও সম্পদহানির গুরুতর আশঙ্কা"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER সতর্কতা"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"শিশু অপহরণ সংক্রান্ত জরুরী বুলেটিন"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS পরীক্ষামূলক সম্প্রচার"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"বাণিজ্যিক মোবাইল অ্যালার্ট সিস্টেমের জন্য পরীক্ষামূলক সম্প্রচার"</string>
+    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ভাইব্রেট"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"পুরো ভলিউমে শুনুন"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ডু নট ডিস্টার্ব এবং ভলিউমের অন্যান্য পছন্দগুলি অগ্রাহ্য করুন"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"জায়গার আপডেটের সম্প্রচার"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"সিম স্ট্যাটাসে আপডেটের তথ্য দেখুন"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"বিকাশকারী বিকল্পগুলি"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"জায়গার আপডেটের সম্প্রচার"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"সিম স্ট্যাটাসে আপডেটের তথ্য দেখুন"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"ডেভেলপার বিকল্প"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"সতর্কতা বিভাগ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"জিওফিজিক্যাল"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"আবহাওয়াগত"</string>
@@ -103,12 +104,12 @@
     <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="4370292554938680862">"প্রথম CMAS সতর্কতা প্রদর্শন করার পর একটি অপ্ট আউট ডায়লগ দেখুন (রাষ্ট্রপতি সতর্কতা ছাড়া)।"</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"প্রথম CMAS সতর্কতা প্রদর্শন করার পর একটি অপ্ট-আউট ডায়লগ দেখুন (রাষ্ট্রপতি সতর্কতা ছাড়া)।"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"অপ্ট আউট ডায়লগ দেখুন"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"আপনি বর্তমানে জরুরী সতর্কতা গ্রহণ করছেন। আপনি কি জরুরী সতর্কতা গ্রহণ করা চালিয়ে যেতে চান?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"হ্যাঁ"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"না"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"জরুরি অ্যালার্টের ইতিহাস"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"জরুরি সতর্কতার ইতিহাস"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"একবার"</item>
     <item msgid="9097229303902157183">"প্রতি ২ মিনিট"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 6f83d20..1d12161 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Info servis"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Postavke Info servisa"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Upozorenja na hitne slučajeve"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Postavke info servisa nisu dostupne ovom korisniku"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Uredu"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nema aktivnih upozorenja u vašem području. Možete promijeniti postavke upozorenja pomoću opcija u meniju Postavke."</string>
@@ -44,24 +44,28 @@
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Upozorenje za vanredne situacije (vježba)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Upozorenje za vanredne situacije (operater)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Upozorenje na vanrednu situaciju"</string>
-    <string name="cb_other_message_identifiers" msgid="7083176204482365281">"Info servis"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Postavke upozorenja za vanredne situacije"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Uključite obavještenja"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Prikaži informacije o vanrednim situacijama"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Podsjetnik za upozorenje"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovorite poruku upozorenja"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Koristite pretvaranje teksta u govor da izgovorite poruke upozorenja"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS postavke"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Prikaz probnih emitiranja za ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Prikaz probnih emitiranja za sistem upozorenja za zemljotrese i cunamije (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Prikaz ekstremnih prijetnji"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Prikaz upozorenja o ekstremnim prijetnjama po život i imovinu"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Prikaz ozbiljnih prijetnji"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Prikaz upozorenja o ozbiljnim prijetnjama po život i imovinu"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Prikaz upozorenja AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Prikaz hitnih obavještenja u slučaju otmice djeteta (upozorenje AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Prikaz probnih emitiranja za CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Prikaz probnih emitiranja za komercijalni sistem upozorenja za mobilne uređaje (CMAS)"</string>
+    <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Emitiranje poruka"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozorenja"</string>
+    <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Poruke emitera"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Dozvoli upozorenja"</string>
+    <!-- no translation found for enable_emergency_alerts_summary (8171013771243907245) -->
+    <skip />
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Zvuk podsjetnika za upozorenja"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovaranje poruka upozorenja"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Korištenje pretvaranja teksta u govor za izgovaranje hitnih upozorenja"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historija hitnih upozorenja"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Postavke upozorenja"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS probna emitiranja"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Probna emitiranja za sistem upozorenja na zemljotrese i cunamije (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Izrazita opasnost"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Izrazita opasnost po život i imovinu"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Velika opasnost"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Velika opasnost po život i imovinu"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"NARANDŽASTA upozorenja"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bilteni hitnih obavještenja kod otmice djeteta"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS probna emitiranja"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Probna emitiranja za komercijalni sistem za upozorenja na mobilnim uređajima"</string>
+    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibracija"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Koristi punu jačinu zvuka"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemari druge postavke jačine zvuka i funkcije Ne ometaj"</string>
     <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Emitiranje informacija o ažuriranju područja"</string>
@@ -101,11 +105,12 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Primljeno:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"Nepročitanih upozorenja: <xliff:g id="COUNT">%s</xliff:g>."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nova upozorenja"</string>
-    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Prikaži dijaloški okvir za isključivanje upozorenja nakon što primite prvo CMAS upozorenje (osim predsjedničkog upozorenja). Also, \"dijaloški okvir\" should be used for \"dialog\""</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Prikaži dij. okvir za isklj. upozorenja"</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Prikaz dijaloškog okvira za isključivanje upozorenja nakon primanja prvog CMAS upozorenja (osim predsjedničkog upozorenja)."</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Prikaz dijal. okvira za isklj. upozorenja"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Trenutno primate upozorenja o vanrednim situacijama. Želite li ih primati i dalje?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Da"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ne"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Historija hitnih alarma"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jednom"</item>
     <item msgid="9097229303902157183">"Svake 2 minute"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4da03c4..600ee28 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Difusions mòbils"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Configuració de difusions mòbils"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alertes d\'emergència"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"La configuració de difusió mòbil no està disponible per a aquest usuari."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"D\'acord"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"No hi ha alertes actives a la teva zona. Pots canviar la configuració d\'alertes mitjançant el menú de configuració."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta d\'emergències (operador)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerta d\'emergències"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Missatges de difusió"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Configuració d\'alertes d\'emergència"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Missatges de difusió"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activa les notificacions"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Mostra les difusions d\'alertes d\'emergència"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatori d\'alertes"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Permet les alertes"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Vull rebre notificacions d\'emergència"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"So dels recordatoris d\'alertes"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Enuncia el missatge d\'alerta"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Utilitza síntesi de veu per enunciar els missatges d\'alertes d\'emergència"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Configuració d\'ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Mostra emissions de prova de l\'ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Mostra les difusions de prova del sistema d\'avís de terratrèmols i tsunamis"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Mostra les amenaces extremes"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Mostra les alertes d\'amenaces extremes per a la vida i la propietat"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Mostra les amenaces greus"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Mostra les alertes d\'amenaces greus per a la vida i la propietat"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Mostra les alertes AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Mostra els avisos d\'emergència per segrest de menors (alerta AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Mostra emissions de prova del CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Mostra les difusions de prova del sistema comercial d\'alertes mòbils"</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 de les alertes"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Difusions de prova de l\'ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Difusions de prova del sistema d\'avís de terratrèmols i tsunamis"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Amenaces extremes"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Amenaces extremes per a la vida i la propietat"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Amenaces greus"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Amenaces greus per a la vida i la propietat"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertes AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Avisos d\'emergència per segrest de menors"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Difusions de prova del CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Difusions de prova del sistema comercial d\'alertes mòbils"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibra"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utilitza el volum màxim"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignora altres preferències de volum i del mode No molestis"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Difusions d\'informació actualitzada de la zona"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostra informació actualitzada a l\'estat de la targeta SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Difusions d\'informació actualitzada de la zona"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostra informació actualitzada a l\'estat de la targeta SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcions per a desenvolupadors"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria de l\'alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísiques"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8ec4acb..3d64b9f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Zprávy informačních služeb"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Nastavení zpráv informačních služeb"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Výstražné zprávy"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Tento uživatel nemůže měnit nastavení zpráv informačních služeb"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Ve vaší oblasti nejsou žádná aktivní upozornění. Nastavení upozornění můžete změnit prostřednictvím nabídky Nastavení."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nouzová výstraha (operátor)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Nouzová výstraha"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Zprávy informačních služeb"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Nastavení upozornění na výjimečnou situaci"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozornění"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Zprávy informačních služeb"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Zapnout oznámení"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Zobrazit výstražné zprávy o výjimečné situaci"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Připomínat upozornění"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Povolit upozornění"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Přijímat nouzová oznámení"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Zvuk připomenutí 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="356086178962268831">"Přečíst zprávy nouzové výstrahy pomocí převodu textu na řeč"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Nastavení systému ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Zobrazit testovací zprávy ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Zobrazit testovací zprávy Systému výstražných varování před zemětřesením a tsunami (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Zobrazovat extrémní hrozby"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Zobrazovat upozornění na extrémní ohrožení života a majetku"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Zobrazovat závažné hrozby"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Zobrazovat upozornění na závažná ohrožení života a majetku"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Zobrazovat upozornění AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Zobrazovat mimořádné zprávy o únosech dětí (upozornění AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Zobrazit testovací zprávy CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Zobrazovat testovací zprávy systému Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historie nouzových výstrah"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Předvolby upozornění"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Testovací zprávy ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testovací zprávy Systému výstražných varování před zemětřesením a tsunami (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extrémní ohrožení"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extrémní ohrožení života a majetku"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Závažná ohrožení"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Závažná ohrožení života a majetku"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Upozornění AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Mimořádné zprávy o únosech dětí"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Testovací zprávy CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testovací zprávy Systému komerčních mobilních upozornění (CMAS)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrace"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Použít plnou hlasitost"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorovat ostatní předvolby hlasitosti a režimu Nerušit"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Zprávy s místními aktualitami"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Zobrazovat ve stavu SIM karty informace o aktualitách"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Zprávy s místními aktualitami"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Zobrazovat ve stavu SIM karty informace o aktualitách"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Pro vývojáře"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorie upozornění:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofyzikální"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 64b2262..317c6ba 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"CB-meddelelser"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Indstillinger for Cell Broadcast-meddelelser"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Nødalarmer"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Denne bruger har ikke adgang til indstillingerne for Cell Broadcast"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Der er ingen aktive advarsler i dit område. Du kan ændre indstillingerne for advarslen ved hjælp af menuen Indstillinger."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Der er ingen aktive advarsler i dit område. Du kan ændre indstillingerne for advarsler i menuen Indstillinger."</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>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nødalarm (mobilselskab)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Nødalarm"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Udsendte beskeder"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Indstillinger for nødalarmer"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alarmer"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Udsendte beskeder"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Aktivér underretninger"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Vis nødudsendelser"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alarm for påmindelse"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Tillad alarmer"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Modtag nødbeskeder"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Lyd for alarmpåmindelse"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Læs advarselsmeddelelser op"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Brug Oplæsning for at indtale beskeder om nødalarmer"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Indstillinger for ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Vis testudsendelser fra ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Vis testmeddelelser for ETWS (varslingssystem ved jordskælv og tsunami)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Vis ekstreme trusler"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Vis advarsler om ekstreme trusler mod liv og ejendom"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Vis alvorlige trusler"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Vis advarsler om alvorlige trusler mod liv og ejendom"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Vis advarsel om barnebortførelse"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Vis bulletiner om nødsituationer i forbindelse med børnebortførelse (AMBER Alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Vis testudsendelser fra CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Vis testudsendelser for Commercial Mobile Alert System"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Testmeddelelser fra ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testmeddelelser for ETWS (varslingssystem ved jordskælv og tsunami)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ekstreme trusler"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ekstreme trusler mod liv og ejendom"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Alvorlige trusler"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Alvorlige trusler mod liv og ejendom"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Advarsler om bortførelse af børn"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bulletiner om nødsituationer i forbindelse med bortførelse af børn"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Testmeddelelser fra CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testmeddelelser for mobilalarmsystemet Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibration"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Anvend fuld lydstyrke"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer andre præferencer for lydstyrke og Forstyr ikke"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Meddelelser om områdeopdatering"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Vis opdateringsoplysninger i SIM-status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Meddelelser om områdeopdatering"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Vis opdateringsoplysninger i SIM-status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Indstillinger for udviklere"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Underretningskategori:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysisk"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 16fc7ee..6139c71 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell Broadcast"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"CB-Einstellungen"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Notfallbenachrichtigungen"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Cell-Broadcast-Einstellungen sind für diesen Nutzer nicht verfügbar."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Es sind keine aktiven Warnungen für deine Umgebung vorhanden. Du kannst die Einstellungen für Warnmeldungen über die Menüoption \"Einstellungen\" ändern."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Notfallbenachrichtigung (Betreiber)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Notfallbenachrichtigung"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast-Nachrichten"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Einstellungen für Notfallbenachrichtigungen"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Benachrichtigungen"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast-Nachrichten"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Benachrichtigungen aktivieren"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Notfallbenachrichtigungen anzeigen"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Benachrichtigungserinnerung"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Benachrichtigungen zulassen"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Notfallmeldungen erhalten"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Benachrichtigungston"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Benachrichtigung sprechen"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Text-in-Sprache zum Sprechen von Notfallbenachrichtigungen verwenden"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS-Einstellungen"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS-Testnachrichten anzeigen"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Testnachrichten für Erdbeben-/Tsunami-Warnsystem anzeigen"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Extreme Gefahren anzeigen"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Warnungen zu extremen Gefahren für Leben und Eigentum anzeigen"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Schwerwiegende Gefahren anzeigen"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Warnungen zu schwerwiegenden Gefahren für Leben und Eigentum anzeigen"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER Alerts anzeigen"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Notfall-Bulletins zu Kindesentführung anzeigen (Amber Alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS-Testnachrichten anzeigen"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Testnachrichten für Commercial Mobile Alert System anzeigen"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Notfallbenachrichtigungsverlauf"</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>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extreme Gefahren"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreme Gefahren für Leben und Eigentum"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Erhebliche Gefahren"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Erhebliche Gefahren für Leben und Eigentum"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER Alerts"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Notfallbulletins zu Kindesentführung"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-Testnachrichten"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testnachrichten für Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrieren"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Mit voller Lautstärke hören"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Andere Einstellungen für Lautstärke und \"Nicht stören\" ignorieren"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Aktuelle Gebietsinformationen"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Aktuelle Informationen im SIM-Status anzeigen"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Aktuelle Gebietsinformationen"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Aktuelle Informationen im SIM-Status anzeigen"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Entwickleroptionen"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Warnungskategorie:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysik"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 53dfcbb..6986ca6 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Εκπομπές κινητής τηλεφωνίας"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Ρυθμίσεις εκπομπής κιν. τηλ."</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Ειδοποιήσεις έκτακτης ανάγκης"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Οι ρυθμίσεις εκπομπής κινητής τηλεφωνίας δεν είναι διαθέσιμες για αυτόν το χρήστη"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Δεν υπάρχουν ενεργές ειδοποιήσεις στην περιοχή σας. Μπορείτε να αλλάξετε τις ρυθμίσεις ειδοποιήσεων χρησιμοποιώντας την επιλογή μενού Ρυθμίσεις."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Ειδοποίηση έκτακτης ανάγκης (εταιρεία κιν. τηλεφ.)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Ειδοποίηση έκτακτης ανάγκης"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Μετάδοση μηνυμάτων"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Ρυθμίσεις ειδοποίησης έκτακτης ανάγκης"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Ειδοποιήσεις"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Μετάδοση μηνυμάτων"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Ενεργοποίηση ειδοποιήσεων"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Εμφάνιση εκπομπών ειδοποιήσεων έκτακτης ανάγκης"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Ειδοποίηση υπενθύμισης"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Να επιτρέπονται ειδοποιήσεις"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Λήψη ειδοποιήσεων έκτακτης ανάγκης"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Ήχος υπενθύμισης ειδοποίησης"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Φωνητικό μήνυμα ειδοποίησης"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Χρήση κειμένου σε ομιλία για την υπόδειξη των μηνυμάτων ειδοποίησης έκτακτης ανάγκης"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Ρυθμίσεις ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Εμφάνιση δοκιμ. μεταδόσ. ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Εμφάνιση δοκιμαστικών εκπομπών για το Σύστημα προειδοποίησης για τσουνάμι και σεισμούς"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Εμφάνιση πολύ σοβαρών απειλών"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Προβολή ειδοποιήσεων για πολύ σοβαρές καταστάσεις που αποτελούν απειλή για τη ζωή και την ιδιοκτησία"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Εμφάνιση σοβαρών απειλών"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Προβολή ειδοποιήσεων για σοβαρές καταστάσεις που αποτελούν απειλή για τη ζωή και την ιδιοκτησία"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Εμφάνιση των ειδοποιήσεων AMBER Alert"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Προβολή επειγουσών ανακοινώσεων σχετικά με απαγωγές παιδιών (AMBER alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Εμφάνιση δοκιμ. μεταδόσ. CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Εμφάνιση δοκιμαστικών μεταδόσεων για το σύστημα Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Ιστορ. ειδοποιήσ. έκτ. ανάγκης"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Προτιμήσεις ειδοποιήσεων"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Δοκιμαστικές μεταδόσεις ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Δοκιμαστικές μεταδόσεις για το σύστημα προειδοποίησης για τσουνάμι και σεισμούς"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ακραίες απειλές"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ακραίες απειλές κατά τη ζωής και της ιδιοκτησίας"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Σοβαρές απειλές"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Σοβαρές απειλές κατά της ζωής και της ιδιοκτησίας"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Ειδοποιήσεις AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Ανακοινώσεις έκτακτης ανάγκης για απαγωγές ανηλίκων"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Δοκιμαστικές μεταδόσεις CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Δοκιμαστικές μεταδόσεις για το σύστημα Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Δόνηση"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Χρήση πλήρους έντασης"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Παράβλεψη προτιμήσεων έντασης και λειτ. \"Μην ενοχλείτε\""</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Μεταδόσεις ενημέρωσης για την περιοχή"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Εμφάνιση πληροφοριών ενημέρωσης στην κατάσταση SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Μεταδόσεις ενημέρωσης για την περιοχή"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Εμφάνιση πληροφοριών ενημέρωσης στην κατάσταση SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Επιλογές για προγραμματιστές"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Κατηγορία ειδοποίησης:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Γεωφυσικά φαινόμενα"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index dacb4c7..1b4cf08 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Mobile broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Mobile broadcast settings"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Emergency alerts"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Mobile broadcast settings are not available for this user"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"There are no active alerts in your area. You can change the Alert settings using the Settings menu option."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Emergency alert (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Emergency alert"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast messages"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Emergency alert settings"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Turn on notifications"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Display emergency alert broadcasts"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alert reminder"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Allow alerts"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Receive emergency notifications"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Alert reminder sound"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Use text-to-speech to speak emergency alert messages"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS settings"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Show ETWS test broadcasts"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Display test broadcasts for Earthquake Tsunami Warning System"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Show extreme threats"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Display alerts for extreme threats to life and property"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Show severe threats"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Display alerts for severe threats to life and property"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Show AMBER alerts"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Display child abduction emergency bulletins (AMBER alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Show CMAS test broadcasts"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Display test broadcasts for Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS test broadcasts"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Test broadcasts for Earthquake Tsunami Warning System"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extreme threats"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreme threats to life and property"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Severe threats"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Severe threats to life and property"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER alerts"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Child abduction emergency bulletins"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS test broadcasts"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Test broadcasts for Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrate"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Alert Category:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index dacb4c7..1b4cf08 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Mobile broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Mobile broadcast settings"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Emergency alerts"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Mobile broadcast settings are not available for this user"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"There are no active alerts in your area. You can change the Alert settings using the Settings menu option."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Emergency alert (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Emergency alert"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast messages"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Emergency alert settings"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Turn on notifications"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Display emergency alert broadcasts"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alert reminder"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Allow alerts"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Receive emergency notifications"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Alert reminder sound"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Use text-to-speech to speak emergency alert messages"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS settings"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Show ETWS test broadcasts"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Display test broadcasts for Earthquake Tsunami Warning System"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Show extreme threats"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Display alerts for extreme threats to life and property"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Show severe threats"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Display alerts for severe threats to life and property"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Show AMBER alerts"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Display child abduction emergency bulletins (AMBER alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Show CMAS test broadcasts"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Display test broadcasts for Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS test broadcasts"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Test broadcasts for Earthquake Tsunami Warning System"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extreme threats"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreme threats to life and property"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Severe threats"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Severe threats to life and property"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER alerts"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Child abduction emergency bulletins"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS test broadcasts"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Test broadcasts for Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrate"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Alert Category:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index dacb4c7..1b4cf08 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Mobile broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Mobile broadcast settings"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Emergency alerts"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Mobile broadcast settings are not available for this user"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"There are no active alerts in your area. You can change the Alert settings using the Settings menu option."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Emergency alert (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Emergency alert"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast messages"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Emergency alert settings"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Turn on notifications"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Display emergency alert broadcasts"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alert reminder"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Allow alerts"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Receive emergency notifications"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Alert reminder sound"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Use text-to-speech to speak emergency alert messages"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS settings"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Show ETWS test broadcasts"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Display test broadcasts for Earthquake Tsunami Warning System"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Show extreme threats"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Display alerts for extreme threats to life and property"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Show severe threats"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Display alerts for severe threats to life and property"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Show AMBER alerts"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Display child abduction emergency bulletins (AMBER alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Show CMAS test broadcasts"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Display test broadcasts for Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS test broadcasts"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Test broadcasts for Earthquake Tsunami Warning System"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extreme threats"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreme threats to life and property"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Severe threats"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Severe threats to life and property"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER alerts"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Child abduction emergency bulletins"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS test broadcasts"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Test broadcasts for Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrate"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Area update broadcasts"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Show update information in SIM status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Show update information in SIM status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Alert Category:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 5f7c087..32b0b1d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Difusiones por teléfono celular"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Servicios de difusión celular"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alertas de emergencia"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"La configuración de la emisión móvil no está disponible para este usuario."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Aceptar"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"No hay alertas activas en tu zona. Puedes modificar la configuración de las alertas en el menú Configuración."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emergencia (operador)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerta de emergencia"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mensajes de transmisión"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Configuración de alertas de emergencia"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensajes de transmisión"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activar notificaciones"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Mostrar las difusiones de alerta de emergencia"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatorio del alerta"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Permitir alertas"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Recibir notificaciones de emergencia"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Sonido 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="356086178962268831">"Utilizar texto a voz para los mensajes de alerta de emergencia"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Configuración de ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Mostrar trans. de prueba ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Mostrar difusiones de prueba del Sistema de Alertas de Terremotos y Tsunamis (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Mostrar amenazas extremas"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Mostrar alertas de amenazas extremas para la vida y la propiedad"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Mostrar amenazas graves"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Mostrar alertas de amenazas graves para la vida y la propiedad"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Mostrar alertas AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Mostrar anuncios de emergencia de secuestro de menores (alerta AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Mostrar trans. de prueba CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Mostrar transmisiones de prueba del Sistema comercial de alerta móvil"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial de alertas de emergencia"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de alertas"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Emisiones de prueba del ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Emisiones de prueba del Sistema de alerta de terremotos y tsunamis"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Amenazas extremas"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Amenazas extremas contra la vida y la propiedad"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Amenazas graves"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Amenazas graves contra la vida y la propiedad"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Boletines de emergencia sobre secuestro de menores"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Emisiones de prueba del CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Emisiones de prueba del Sistema comercial de alertas móviles"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usar volumen máximo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar otras preferencias de volumen y No interrumpir"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Emisiones de información actualizada del área"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostrar información de actualización en el estado de la SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Emisiones de información actualizada del área"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostrar información de actualización en el estado de la SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opciones del programador"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoría de alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísicas"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 9050c0d..36ef9cd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Mensajes de radiodifusión"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Ajustes de radiodifusión"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alertas de emergencias"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Los ajustes de difusión móvil no están disponibles para este usuario"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Aceptar"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"No hay alertas activas en tu zona. Puedes modificar la configuración de las alertas a través del menú Ajustes."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emergencia (operador)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerta de emergencia"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mensajes de difusión"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Ajustes de alertas de emergencia"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensajes de difusión"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activar notificaciones"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Mostrar emisiones de alerta de emergencia"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatorio de la alerta"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Permitir alertas"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Recibir notificaciones de emergencia"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Sonido recordatorio de alertas"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Decir mensaje de alerta"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Utilizar síntesis de voz para los mensajes de alerta de emergencia"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Ajustes de ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Emisiones de prueba del ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Mostrar emisiones de prueba del sistema de alerta de tsunami y terremoto"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Mostrar amenazas extremas"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Mostrar alertas de amenazas extremas para la vida y la propiedad"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Mostrar amenazas graves"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Mostrar alertas de amenazas graves para la vida y la propiedad"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Mostrar alertas AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Mostrar avisos de emergencia de secuestro de menores (alerta AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Emisiones de prueba del CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Mostrar emisiones de prueba del sistema comercial de alerta móvil"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial de alertas de emergencia"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de las alertas"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Difusiones de prueba del ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Difusiones de prueba del sistema de alerta de tsunami y terremoto"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Amenazas extremas"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Alertas por amenazas extremas contra la vida y la propiedad"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Amenazas graves"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Alertas por amenazas graves para la vida y la propiedad"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Avisos de emergencia de secuestro de menores"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Difusiones de prueba del CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Difusiones de prueba del sistema comercial de alerta móvil"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"A todo volumen"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar otras preferencias de volumen y No molestar"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Difusiones de información actualizada sobre la zona"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostrar información actualizada en el estado de la SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Difusiones de información actualizada de la zona"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostrar información actualizada en el estado de la SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opciones para desarrolladores"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoría de la alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísicas"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 2846eb8..33f705b 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Kärjeteated"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Kärjeteate seaded"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Hädaolukorra teatised"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Kärjeteate seaded pole sellele kasutajale saadaval"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Teie piirkonnas ei ole aktiivseid häireid. Võite häirete seadeid muuta menüüvalikus Seaded."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Teie piirkonnas ei ole aktiivseid häireid. Võite teatiste seadeid muuta menüüvalikus Seaded."</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>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Hädaolukorra märguanne (operaator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Hädaolukorra märguanne"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sõnumite edastamine"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Hädaolukorra märguannete seaded"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Teatised"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sõnumite edastamine"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Lülita märguanded sisse"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Hädaolukorral levitatavate märguannete kuvamine"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Märguannete meeldetuletus"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Teatiste lubamine"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Teil on võimalik saada hädaolukorra teatisi"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Teatise meeldetuletuse heli"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Märguandesõnumi esitamine kõnena"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Kõnesünteesi funktsiooni kasutamine hädaolukorra märguannete sõnumite esitamiseks kõnena"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS-i seaded"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Kuva ETWS-i katseteavitusi"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Maavärina ja hiidlaine hoiatussüsteemi testsaadete kuvamine"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Kuva äärmuslikud ohud"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Märguannete kuvamine, kui ilmneb äärmuslik oht elule ja varale"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Kuva tõsised ohud"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Märguannete kuvamine, kui ilmneb tõsine oht elule ja varale"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Kuva AMBER-märguanded"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Lapseröövi häiremärguannete (AMBER-häire) kuvamine"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Kuva CMAS-i katseteavitusi"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Commercial Mobile Alert Systemi katseteavituste kuvamine"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Hädaolukorra teatiste ajalugu"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Teatiste eelistused"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-i katseteatised"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Maavärina ja hiidlaine hoiatussüsteemi katseteatised"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Väga tõsine oht"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Väga tõsine oht elule ja varale"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Tõsine oht"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Tõsine oht elule ja varale"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"KOLLASED teatised"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Lapseröövi häireteadaanded"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-i katseteatised"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Tasulse mobiiliteavituste süsteemi katseteatised"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibreerimine"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Kasutage max helitugevust"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignoreerige muid helitug. ja režiimi Mitte segada eelistusi"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Piirkonna värskenduste edastamine"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM-kaardi olekus kuvatakse värskendamisteave"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Piirkonna värskenduste edastamine"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM-kaardi olekus värskendamisteabe kuvamine"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Arendaja valikud"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Märguandekategooria:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofüüsika"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Praegu on hädaolukorra märguannete saamine kasutusel. Kas soovite hädaolukorra märguandeid jätkuvalt saada?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Jah"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ei"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Hädaolukorra märguannete ajalugu"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Hädaolukorra teatiste ajalugu"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Üks kord"</item>
     <item msgid="9097229303902157183">"Iga 2 minuti järel"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d1d4cbe..ed3c72e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Sare mugikor bidezko igorpenak"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Sare mugikor bidezko igorpenen ezarpenak"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Larrialdi-abisuak"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Erabiltzaile honek ez dauzka erabilgarri igorpen zelularraren ezarpenak"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Ados"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Ez dago alerta aktiborik zure inguruan. Alerten ezarpenak alda ditzakezu Ezarpenak menuko aukera erabilita."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Ez dago abisu aktiborik zure inguruan. Abisuen ezarpenak aldatzeko, zoaz Ezarpenak menuko aukerara."</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>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Larrialdi-abisua (operadorea)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Larrialdi-alerta"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Igorpen-mezuak"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Larrialdi-abisuen ezarpenak"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Abisuak"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Igorpen-mezuak"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Aktibatu jakinarazpenak"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Bistaratu larrialdi-abisuen igorpenak"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alerta-egoeraren abisua"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Onartu abisuak"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Jaso larrialdi-jakinarazpenak"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Abisuen soinua"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Irakurri alerta-mezua ozen"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Erabili testua audio gisa erreproduzitzeko eginbidea larrialdi-abisuen mezuak ozen irakurtzeko"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS ezarpenak"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Erakutsi ETWS probako igorpenak"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Bistaratu lurrikarez eta tsunamiez ohartarazteko sistemaren probako igorpenak"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Erakutsi muturreko arriskuak"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Bistaratu bizitza eta jabetza arrisku larrian jartzen dituzten egoeretako abisuak"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Erakutsi arrisku larriak"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Erakutsi bizitza eta jabetza arrisku larrian jartzen dituzten egoeretako abisuak"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Erakutsi AMBER abisuak"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Bistaratu haurrak bahitzeagatiko larrialdi-albisteak (AMBER alerta)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Erakutsi CMAS probako igorpenak"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Erakutsi mugikorretarako merkataritzako alerta sistemaren probako igorpenak"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Larrialdi-abisuen historia"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Abisuen hobespenak"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS probako igorpenak"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Lurrikarez eta tsunamiez ohartarazteko sistemaren (ETWS) probako igorpenak"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Arrisku oso larriak"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Bizitza eta jabetza arrisku oso larrian jartzen dituzten egoerak"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Arrisku larriak"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Bizitza eta jabetza arrisku larrian jartzen dituzten egoerak"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER abisuak"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Haurrak bahitzeagatiko larrialdi-albisteak"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS probako igorpenak"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Mugikorretarako merkataritzako abisu-sistemaren (CMAS) probako igorpenak"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Egin dar-dar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Erabili bolumen osoa"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Egin ez ikusi bolumenaren eta Ez molestatu moduaren hobespenei"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Inguruko berritasunei buruzko igorpenak"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Erakutsi berritasunei buruzko informazioa SIM txartelaren egoeran"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Inguruko berritasunei buruzko igorpenak"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Erakutsi berritasunei buruzko informazioa SIMaren egoeran"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Garatzaileen aukerak"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Alerten kategoria:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisikoak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ba4f33a..dffcb92 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"پخش‌های سلولی"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"تنظیمات پخش سلولی"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"هشدارهای اضطراری"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"تنظیمات پخش سلولی برای این کاربر در دسترس نیست"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"تأیید"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"در منطقه شما هشدارهای فعال وجود ندارد. می‌توانید تنظیمات هشدار را با استفاده از گزینه منوی تنظیمات تغییر دهید."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"هشدار اضطراری (اپراتور)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"هشدار اضطراری"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"پیام‌های پخش"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"تنظیمات هشدار اضطراری"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"هشدارها"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"پیام‌های پخش"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"روشن کردن اعلان‌ها"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"نمایش پخش‌های هشدار اضطراری"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"یادآور هشدار"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"اجازه دادن به هشدارها"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"دریافت اعلان‌های اضطراری"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"صدای یادآوری هشدار"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"گفتن پیام هشدار"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"برای گفتن پیام‌های هشدار اضطراری از متن به گفتار استفاده کنید"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"‏تنظیمات ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"‏نمایش پخش‌های آزمایشی ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"نمایش پخش‌های آزمایشی برای سیستم هشدار دهنده سونامی زلزله"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"نمایش تهدیدات بسیار جدی"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"نمایش هشدارها برای تهدیدهای بسیار جدی جانی و مالی"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"نمایش تهدیدات جدی"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"نمایش هشدارها برای تهدیدات جدی جانی و مالی"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"‏نمایش هشدارهای AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"‏نمایش بولتن‌های اضطراری ربوده شدن کودک (هشدار AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"‏نمایش پخش‌های آزمایشی CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"نمایش پخش‌های آزمایشی برای سیستم هشدار تجاری سیار"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"سابقه هشدار اضطراری"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"تنظیمات هشدار"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"‏پخش‌های آزمایشی ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"پخش‌های آزمایشی برای سیستم هشدار سونامی زلزله"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"تهدیدهای بسیار جدی"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"تهدیدهای بسیار جدی جانی و مالی"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"تهدیدهای جدی"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"تهدیدهای جدی جانی و مالی"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏هشدارهای AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"بولتن‌های اضطراری کودک‌ربایی"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"‏پخش‌های آزمایشی CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"پخش‌های آزمایشی برای سیستم هشدارهای اضطراری بی‌سیم"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"لرزش"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"استفاده از میزان صدای کامل"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"نادیده گرفتن سایر تنظیمات برگزیده «مزاحم نشوید» و میزان صدا"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"پخش‌های به‌روزرسانی منطقه"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"نمایش اطلاعات به‌روزرسانی در وضعیت سیم‌کارت"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"پخش‌های به‌روزرسانی منطقه"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"نمایش اطلاعات به‌روزرسانی در وضعیت سیم‌کارت"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"گزینه‌های برنامه‌نویسان"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"دسته هشدار:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ژئوفیزیکی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 728789e..88eab45 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell Broadcast -lähetykset"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Cell Broadcast -asetukset"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Hätätiedotteet"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Solulähetysasetukset eivät ole käytettävissä tälle käyttäjälle"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Omalla alueellasi ei ole aktiivisia hälytyksiä. Voit vaihtaa hälytysasetuksia Asetukset-valikosta."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Hätätilannevaroitus (operaattori)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Hätätilannevaroitus"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Lähetysviestit"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Hätätilannevaroitusten asetukset"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Ilmoitukset"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Lähetysviestit"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Ota ilmoitukset käyttöön"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Näytä hätätilannevaroituslähetyksiä"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Ilmoitusmuistutus"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Salli hälytykset"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Tilaa hätätilailmoitukset"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Ilmoitusmuistutuksen ääni"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Puhu varoitusilmoitus"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Käytä tekstistä puheeksi -toimintoa hätätilannevaroitusviesteissä"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS-asetukset"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Näytä ETWS-testilähetykset"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Näytä maanjäristys- ja tsunamivaroitusjärjestelmän koelähetykset"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Näytä äärimmäiset uhkat"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Näytä äärimmäiset ihmishenkiä ja omaisuutta koskevat hälytykset"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Näytä vakavat uhkat"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Näytä vakavat ihmishenkiä ja omaisuutta koskevat hälytykset"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Näytä lapsikaappaushälytykset"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Näytä lapsikaappauksien hätätiedotteet"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Näytä CMAS-testilähetykset"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Näytä Commercial Mobile Alert Systemin testilähetykset"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Hätätiedotteiden historia"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Ilmoitusasetukset"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-testilähetykset"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Maanjäristys- ja tsunamivaroitusjärjestelmän koelähetykset"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Erittäin vakavat uhat"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Erittäin vakavat ihmishenkiä ja omaisuutta koskevat uhat"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Vakavat uhat"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Vakavat ihmishenkiä ja omaisuutta koskevat uhat"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-hälytykset"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Lapsikaappauksien hätätiedotteet"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-testilähetykset"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Commercial Mobile Alert Systemin testilähetykset"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Värinä"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Täysi äänenvoimakkuus"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ohita muut volyymi- ja Älä häiritse ‑valinnat."</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Alueelliset ilmoitukset"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Näytä päivitystiedot SIM-kortin tilassa."</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Alueelliset ilmoitukset"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Näytä päivitystiedot SIM-kortin tilassa."</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Kehittäjäasetukset"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Ilmoitusluokka:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysikaalinen"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6148989..bf46091 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Diffusions cellulaires"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Paramètres de diffusion cellulaire"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alertes d\'urgence"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Les paramètres de diffusion cellulaire ne sont pas disponibles pour cet utilisateur"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Il n\'y a aucune alerte active dans votre région. Vous pouvez modifier les paramètres d\'alerte à l\'aide de l\'option de menu Paramètres."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerte d\'urgence (opérateur)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerte d\'urgence"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Messages de diffusion"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Paramètres d\'alerte d\'urgence"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messages de diffusion"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activer les notifications"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Afficher les diffusions d\'alerte d\'urgence"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Rappel d\'alerte"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Autoriser les alertes"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Recevoir les notifications d\'urgence"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Son de 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="356086178962268831">"Utiliser la synthèse vocale pour énoncer les messages d\'alerte d\'urgence"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Paramètres ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Afficher diffusions test ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Afficher les diffusions test du système d\'avertissement pour tremblements de terre et tsunamis"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Afficher les menaces extrêmes"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Afficher les alertes relatives aux menaces extrêmes à la vie et aux biens"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Afficher les menaces importantes"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Afficher les alertes relatives aux menaces importantes à la vie et aux biens"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Afficher les alertes AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Afficher les bulletins d\'urgence relatifs aux enlèvements d\'enfants (alerte AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Afficher diffusions test CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Afficher les diffusions test pour le CMAS (système d\'alerte pour mobile commercial)"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Diffusions tests ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Diffusions test du système d\'avertissement pour tremblements de terre et tsunamis"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Menaces extrêmes"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Menaces extrêmes à la vie et aux biens"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Menaces sévères"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Menaces sévères à la vie et aux biens"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertes AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bulletins d\'urgence relatifs aux enlèvements d\'enfants"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Diffusions tests pour le CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Diffusions tests pour le CMAS (système d\'alerte commercial pour appareils mobiles)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibreur"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utiliser le plein volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer autres préférences de volume et de Ne pas déranger"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Diffusion de mises à jour régionales"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Afficher les données de mise à jour dans l\'état de la carte SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Diffusion de mises à jour régionales"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Afficher les données de mise à jour dans l\'état de la carte SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Options pour les concepteurs"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Catégorie d\'alerte :"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Géophysique"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6d9c2ce..e1b17fd 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Diffusions cellulaires"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Paramètres de diffusion cellulaire"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alertes d\'urgence"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Les paramètres de diffusion cellulaire ne sont pas disponibles pour cet utilisateur."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Il n\'existe aucune alerte active dans votre région. Vous pouvez modifier les paramètres d\'alerte à l\'aide de l\'option de menu \"Paramètres\"."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerte d\'urgence (opérateur)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerte d\'urgence"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Messages de diffusion"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Paramètres d\'alerte d\'urgence"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertes"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messages de diffusion"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activer les notifications"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Afficher les diffusions d\'alerte d\'urgence"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Rappel d\'alerte"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Autoriser les alertes"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Recevoir des notifications d\'urgence"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Son du 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="356086178962268831">"Utiliser la synthèse vocale pour énoncer des messages d\'alerte d\'urgence"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Paramètres ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Afficher les diffusions test ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Afficher les diffusions test du système d\'avertissement pour tremblements de terre et tsunamis"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Afficher les menaces graves"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Afficher les alertes relatives aux menaces graves pour la vie et les biens"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Afficher menaces importantes"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Afficher les alertes relatives aux menaces importantes pour la vie et les biens"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Afficher les alertes Enlèvement"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Afficher les bulletins d\'urgence relatifs aux enlèvements d\'enfants (Alerte Enlèvement)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Afficher diffusions test CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Afficher les diffusions test pour le CMAS (système d\'alerte pour mobile commercial)"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historique alertes d\'urgence"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Préférences d\'alerte"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Diffusions test ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Diffusions test du système d\'avertissement pour tremblements de terre et tsunamis"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Menaces extrêmes"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Menaces extrêmes pour les biens et personnes"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Menaces graves"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Menaces graves pour les biens et personnes"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertes Enlèvement"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bulletins d\'urgence relatifs aux enlèvements d\'enfants"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Diffusions test pour le CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Diffusions test pour le CMAS (système d\'alerte pour mobile commercial)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibreur"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utiliser le volume maximal"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer autres préférences volume et \"Ne pas déranger\""</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Diffusion des dernières informations locales"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Afficher les dernières informations dans l\'état de la carte SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Diffusion des dernières informations locales"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Afficher les dernières informations dans l\'état de la carte SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Options pour les développeurs"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Catégorie d\'alerte :"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Géophysique"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index b38d6d3..1af6859 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Difusións móbiles"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Configuración da difusión móbil"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alertas de urxencia"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"A configuración da difusión móbil non está dispoñible para este usuario"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Aceptar"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Non hai alertas activas na túa zona. Podes cambiar a configuración das alertas a través da opción do menú Configuración."</string>
@@ -35,39 +35,40 @@
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"Aviso de tsunami"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Aviso de terremoto e tsunami"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"Mensaxe de proba do ETWS"</string>
-    <string name="etws_other_emergency_type" msgid="5233080551309721499">"Aviso de emerxencia"</string>
+    <string name="etws_other_emergency_type" msgid="5233080551309721499">"Aviso de urxencia"</string>
     <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Alerta presidencial"</string>
-    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Alerta de emerxencia: extrema"</string>
-    <string name="cmas_severe_alert" msgid="4135809475315826913">"Alerta de emerxencia: grave"</string>
+    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Alerta de urxencia: extrema"</string>
+    <string name="cmas_severe_alert" msgid="4135809475315826913">"Alerta de urxencia: grave"</string>
     <string name="cmas_amber_alert" msgid="6154867710264778887">"Secuestro de menores (alerta AMBER)"</string>
-    <string name="cmas_required_monthly_test" msgid="6464047268150108932">"Proba mensual de alerta de emerxencia"</string>
-    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Alerta de emerxencia (simulacro)"</string>
-    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emerxencia (operador)"</string>
-    <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerta de emerxencia"</string>
+    <string name="cmas_required_monthly_test" msgid="6464047268150108932">"Proba mensual de alerta de urxencia"</string>
+    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Alerta de urxencia (simulacro)"</string>
+    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de urxencia (operador)"</string>
+    <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerta de urxencia"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mensaxes de emisión"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Configuración das alertas de emerxencia"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensaxes de emisión"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activar as notificacións"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Mostrar emisións de alertas de emerxencia"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Recordatorio de alerta"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Permitir alertas"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Recibir notificacións de urxencia"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Son do recordatorio de alerta"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ler mensaxe de alerta"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Usar síntese de voz para ler as mensaxes de alertas de emerxencia"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Configuración do ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Mostrar emisións de proba do ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Mostrar emisións de proba do sistema de avisos de terremotos e tsunamis (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Mostrar ameazas extremas"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Mostrar alertas de ameazas extremas para a vida e a propiedade"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Mostrar ameazas graves"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Mostrar alertas de ameazas graves para a vida e a propiedade"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Mostrar alertas AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Mostrar avisos de emerxencia de secuestro de menores (alerta AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Mostrar emisións de proba CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Mostrar emisións de proba de CMAS (sistema comercial de alertas móbiles)"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Usar síntese de voz para ler as mensaxes de alertas de urxencia"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial de alertas de urxencia"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de alertas"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Emisións de proba do ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Emisións de proba do sistema de avisos de terremotos e tsunamis (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ameazas extremas"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ameazas extremas para a vida e a propiedade"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ameazas graves"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ameazas graves para vida e a propiedade"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Avisos de urxencia de secuestro de menores"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Emisións de proba de CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Emisións de proba de CMAS (sistema comercial de alertas móbiles)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usar volume completo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignora outras preferencias de volume e de Non molestar"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Emisións de información actualizada sobre a zona"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostra información actualizada no estado da SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Emisións de información actualizada sobre a zona"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostra información actualizada no estado da SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcións de programador"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoría de alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Xeofísicas"</string>
@@ -105,10 +106,10 @@
     <string name="notification_multiple_title" msgid="1523638925739947855">"Alertas novas"</string>
     <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Mostrar un diálogo de desactivación tras mostrar a primeira alerta CMAS (agas para alerta presidencial)"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Mostrar un diálogo de desactivación"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Actualmente recibes alertas de emerxencia. Queres seguir recibindo alertas de emerxencia?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Actualmente recibes alertas de urxencia. Queres seguir recibindo alertas de urxencia?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Si"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Non"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Historial de alertas de emerxencia"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Historial de alertas de urxencia"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Unha vez"</item>
     <item msgid="9097229303902157183">"Cada 2 minutos"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 6654b2e..9c354fc 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"સેલ બ્રોડકાસ્ટ્સ"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"સેલ બ્રોડકાસ્ટ સેટિંગ્સ"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"કટોકટીની ચેતવણીઓ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"સેલ બ્રોડકાસ્ટ સેટિંગ્સ આ વપરાશકર્તા માટે ઉપલબ્ધ નથી"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ઓકે"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"તમારા ક્ષેત્રમાં કોઈ સક્રિય ચેતવણીઓ નથી. તમે સેટિંગ્સ મેનૂ વિકલ્પનો ઉપયોગ કરીને ચેતવણી સેટિંગ્સ બદલી શકો છો."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"કટોકટીની ચેતવણી (ઓપરેટર)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"કટોકટીની ચેતવણી"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"બ્રોડકાસ્ટના સંદેશા"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"કટોકટીની ચેતવણીની સેટિંગ્સ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"ચેતવણીઓ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"બ્રોડકાસ્ટના સંદેશા"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"સૂચનાઓ ચાલુ કરો"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"કટોકટીની ચેતવણીના બ્રોડકાસ્ટ્સ પ્રદર્શિત કરો"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ચેતવણી સ્મૃતિપત્ર"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"ચેતવણીઓને મંજૂરી આપો"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"કટોકટીની સૂચનાઓ પ્રાપ્ત કરો"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"ચેતવણી આપતા રિમાઇન્ડરનો અવાજ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ચેતવણી સંદેશ બોલો"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"કટોકટીની ચેતવણીના સંદેશા બોલવા માટે ટેક્સ્ટ-થી-વાણીનો ઉપયોગ કરો"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS સેટિંગ્સ"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS પરીક્ષણ બ્રોડકાસ્ટ્સ બતાવો"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"અર્થક્વેક સુનામી વૉર્નિંગ સિસ્ટમ માટેનાં પરીક્ષણ બ્રોડકાસ્ટ્સ પ્રદર્શિત કરો"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"અત્યંત જોખમો બતાવો"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"જીવન અને સંપત્તિના અત્યંત જોખમ માટેની ચેતવણીઓ પ્રદર્શિત કરો"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ગંભીર જોખમો બતાવો"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"જીવન અને સંપત્તિના ગંભીર જોખમ માટેની ચેતવણીઓ પ્રદર્શિત કરો"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER ચેતવણીઓ બતાવો"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"બાળ અપહરણનાં કટોકટીનાં બુલેટિન્સ પ્રદર્શિત કરો (AMBER ચેતવણી)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS પરીક્ષણ બ્રોડકાસ્ટ્સ બતાવો"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"કોમર્શિયલ મોબાઇલ એલર્ટ સિસ્ટમ માટેનાં પરીક્ષણ બ્રોડકાસ્ટ્સ પ્રદર્શિત કરો"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"કટોકટીની ચેતવણીનો ઇતિહાસ"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"ચેતવણીની પસંદગીઓ"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWSના પરીક્ષણ બ્રોડકાસ્ટ"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"ભૂકંપ ત્સુનામીની ચેતવણી આપતી સિસ્ટમ માટેનાં પરીક્ષણ બ્રોડકાસ્ટ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"આત્યંતિક જોખમો"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"જીવન અને સંપત્તિના આત્યંતિક જોખમો"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ગંભીર જોખમો"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"જીવન અને સંપત્તિના ગંભીર જોખમો"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER ચેતવણીઓ"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"બાળ અપહરણની કટોકટીના બુલેટિન્સ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS પરીક્ષણ બ્રોડકાસ્ટ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"વ્યાવસાયિક મોબાઇલ ચેતવણી સિસ્ટમ માટેનાં પરીક્ષણ બ્રોડકાસ્ટ"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"વાઇબ્રેટ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"પૂર્ણ વૉલ્યૂમનો ઉપયોગ કરો"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"અન્ય વૉલ્યૂમ અને ખલેલ પાડશો નહીં પસંદગીઓને અવગણો"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"વિસ્તારના અપડેટ વિશેના બ્રૉડકાસ્ટ"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"અપડેટ વિશેની માહિતી SIMની સ્થિતિમાં બતાવો"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"વિસ્તારના અપડેટ વિશેના બ્રૉડકાસ્ટ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"અપડેટ વિશેની માહિતી SIMની સ્થિતિમાં બતાવો"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"વિકાસકર્તાનાં વિકલ્પો"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ચેતવણીની કૅટેગરી:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ભૂભૌતિકીય"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 88e5343..704695b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -16,21 +16,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="7559008249836700599">"सेल प्रसारण"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"सेल प्रसारण सेटिंग"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"सेल प्रसारण सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
+    <string name="app_label" msgid="7559008249836700599">"सेल ब्रॉडकास्ट (CBC)"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"आपातकालीन सूचनाएं"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"सेल ब्रॉडकास्ट (CBC) सेटिंग इस उपयोगकर्ता के लिए मौजूद नहीं हैं"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ठीक है"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"आपके क्षेत्र में कोई सक्रिय अलर्ट नहीं है. आप सेटिंग मेनू विकल्‍प का उपयोग करके अलर्ट सेटिंग बदल सकते हैं."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"आपके इलाके में कोई सक्रिय अलर्ट नहीं है. आप सेटिंग मेन्यू विकल्‍प का इस्तेमाल करके अलर्ट सेटिंग बदल सकते हैं."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"सेटिंग"</string>
-    <string name="menu_delete_all" msgid="3940997343921149800">"प्रसारण हटाएं"</string>
+    <string name="menu_delete_all" msgid="3940997343921149800">"प्रसारण मिटाएं"</string>
     <string name="message_options" msgid="3178489901903589574">"संदेश विकल्‍प"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"विवरण देखें"</string>
-    <string name="menu_delete" msgid="128380070910799366">"प्रसारण हटाएं"</string>
+    <string name="menu_delete" msgid="128380070910799366">"प्रसारण मिटाएं"</string>
     <string name="view_details_title" msgid="1780427629491781473">"अलर्ट विवरण"</string>
-    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"यह प्रसारण हटाएं?"</string>
-    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"प्राप्त हुए सभी प्रसारण संदेश हटाएं?"</string>
-    <string name="button_delete" msgid="4672451757925194350">"हटाएं"</string>
-    <string name="button_cancel" msgid="7479958360523246140">"अभी नहीं"</string>
+    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"यह प्रसारण मिटाएं?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"मिले हुए सभी प्रसारण संदेश मिटाएं?"</string>
+    <string name="button_delete" msgid="4672451757925194350">"मिटाएं"</string>
+    <string name="button_cancel" msgid="7479958360523246140">"रद्द करें"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"भूकंप चेतावनी"</string>
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"सुनामी चेतावनी"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"भूकंप और सुनामी चेतावनी"</string>
@@ -45,30 +45,31 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"आपातकालीन अलर्ट (ऑपरेटर)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"आपातकालीन अलर्ट"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"प्रसारण संदेश"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"आपातकालीन अलर्ट सेटिंग"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"सूचनाएं"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण संदेश"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"नोटिफ़िकेशन चालू करें"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"आपातकालीन अलर्ट प्रसारण दिखाएं"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"याद दिलाने के लिए अलर्ट"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"सूचनाओं को अनुमति दें"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"आपातकालीन सूचना पाएं"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"सूचना रिमाइंडर की आवाज़"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"अलर्ट संदेश बोलें"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"आपातकालीन अलर्ट संदेश बोलने के लिए लेख-से-बोली का उपयोग करें"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS सेटिंग"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS परीक्षण प्रसारण दिखाएं"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"भूकंप सुनामी चेतावनी सिस्‍टम के लिए परीक्षण प्रसारण दिखाएं"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"अत्यधिक खतरे दिखाएं"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"जीवन और संपत्ति से जुड़े हुए अत्यधिक खतरों के अलर्ट दिखाएं"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"गंभीर खतरे दिखाएं"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"जीवन और संपत्ति के गंभीर खतरों के लिए अलर्ट दिखाएं"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER अलर्ट दिखाएं"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"बच्‍चे के अपहरण की आपातकालीन बुलेटिन दिखाएं (AMBER अलर्ट)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS परीक्षण प्रसारण दिखाएं"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"व्यावसायिक मोबाइल अलर्ट सिस्‍टम के लिए परीक्षण प्रसारण दिखाएं"</string>
-    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंपन"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"आपातकालीन चेतावनी का इतिहास"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"सूचना प्राथमिकताएं"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS परीक्षण प्रसारण"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"भूकंप सुनामी चेतावनी सिस्‍टम के लिए परीक्षण प्रसारण"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"अत्यधिक खतरे"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"जान और माल से जुड़े अत्यधिक खतरे"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"गंभीर खतरे"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"जान और माल से जुड़े गंभीर खतरे"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER सूचनाएं"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"बच्‍चे के अपहरण का आपातकालीन बुलेटिन"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS परीक्षण प्रसारण"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"व्यावसायिक मोबाइल सूचना सिस्‍टम के लिए परीक्षण प्रसारण"</string>
+    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंपन (वाइब्रेशन)"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"पूरे वॉल्यूम का उपयोग करें"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"अन्य वॉल्यूम और परेशान न करें प्राथमिकताओं को अनदेखा करें"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"क्षेत्र अपडेट प्रसारण"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM स्थिति में अपडेट जानकारी दिखाएं"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"डेवलपर विकल्प"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"क्षेत्र अपडेट प्रसारण"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"सिम की स्थिति में बदलाव की जानकारी दिखाएं"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"डेवलपर के लिए सेटिंग और टूल"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"अलर्ट श्रेणी:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"भूभौतिकीय"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"मौसम संबंधी"</string>
@@ -98,7 +99,7 @@
     <string name="cmas_urgency_immediate" msgid="1577485208196449288">"तुरंत"</string>
     <string name="cmas_urgency_expected" msgid="6830831119872375936">"अपेक्षित"</string>
     <string name="cmas_certainty_heading" msgid="8374669249736439193">"निश्चितता:"</string>
-    <string name="cmas_certainty_observed" msgid="3668549749352106472">"अवलोकन किया गया"</string>
+    <string name="cmas_certainty_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>
@@ -111,9 +112,9 @@
     <string name="cb_list_activity_title" msgid="1433502151877791724">"आपातकालीन चेतावनी का इतिहास"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"एक बार"</item>
-    <item msgid="9097229303902157183">"प्रत्येक 2 मिनट में"</item>
+    <item msgid="9097229303902157183">"हर 2 मिनट में"</item>
     <item msgid="5718214950343391480">"प्रत्‍येक 5 मिनट"</item>
-    <item msgid="3863339891188103437">"प्रत्‍येक 15 मिनट"</item>
+    <item msgid="3863339891188103437">"हर 15 मिनट"</item>
     <item msgid="6868848414437854609">"बंद"</item>
   </string-array>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 30c80db..f321eb5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Poruke mobilne mreže"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Postavke emitiranja na mobitele"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Hitna upozorenja"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Postavke emitiranja na mobitele nisu dostupne za ovog korisnika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"U redu"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nema aktivnih upozorenja u vašem području. Postavke upozorenja možete promijeniti odabirom te opcije s izbornika Postavke."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Hitna upozorenja (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Hitno upozorenje"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Emitirane poruke"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Postavke hitnih upozorenja"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozorenja"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Emitirane poruke"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Uključivanje obavijesti"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Prikaži emitiranja hitnih upozorenja"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Podsjetnik upozorenja"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Dopusti upozorenja"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Primaj hitne obavijesti"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Zvuk podsjetnika upozorenja"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovaranje poruka upozorenja"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Upotrijebite pretvaranje teksta u govor za izgovaranje hitnih upozorenja"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Postavke za ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Prikaz ETWS-ovih probnih emitiranja"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Prikaži probna emitiranja za sustav upozorenja o potresima i tsunamijima"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Prikaz ekstremnih prijetnji"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Prikaz upozorenja o ekstremnim prijetnjama životima i imovini"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Prikaz ozbiljnih prijetnji"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Prikaz upozorenja o ozbiljnim prijetnjama životima i imovini"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Prikaz upozorenja AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Prikaz hitnih obavijesti o otmicama djece (upozorenje AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Prikaz CMAS-ovih probnih emitiranja"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Prikaz probnih emitiranja komercijalnog sustava mobilnog upozoravanja"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Povijest hitnih upozorenja"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Postavke upozorenja"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-ova probna emitiranja"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Probna emitiranja za sustav upozorenja o potresima i tsunamijima"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ekstremne prijetnje"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ekstremne prijetnje životima i imovini"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ozbiljne prijetnje"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ozbiljne prijetnje životima i imovini"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER upozorenja"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Hitni bilteni o otmicama djece"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-ova probna emitiranja"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Probna emitiranja komercijalnog sustava mobilnog upozoravanja"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibracija"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Koristi punu glasnoću"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemari druge postavke glasnoće i značajke Ne uznemiravaj"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Emitiranja obavijesti za područje"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Prikaži informacije o obavijestima u statusu SIM-a"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemari druge postavke glasnoće i značajke Ne ometaj"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Emitiranja obavijesti za područje"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Prikaži informacije o obavijestima u statusu SIM-a"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcije za razvojne programere"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorija upozorenja:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizičko"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Trenutačno primate Hitna upozorenja. Želite li ih primati i dalje?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Da"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ne"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Povijest upozorenja o hitnim slučajevima"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Upozorenja o hitnim slučajevima"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jedanput"</item>
     <item msgid="9097229303902157183">"Svake 2 minute"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 568ac31..95483d2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cellán belüli adások"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Cellán belüli adások beállításai"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Vészriasztások"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"A cellán belüli üzenetszórásra vonatkozó beállítások nem érhetők el ennél a felhasználónál"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Jelenleg nincsenek aktív értesítések a tartózkodási helyén. A Beállítások menüben módosíthatja az Értesítés beállításait."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Vészjelzés (operátor)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Vészjelzés"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sugárzott üzenetek"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Vészjelzés beállításai"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Figyelmeztetések"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sugárzott üzenetek"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Értesítések bekapcsolása"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Vészjelzési adások megjelenítése"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Figyelmeztetési emlékeztető"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Figyelmeztetések engedélyezése"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Sürgős értesítések fogadása"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Emlékeztető hangja"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Figyelmeztetés felolvasása"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Használja a szövegfelolvasót vészhelyzeti figyelmeztető üzenetek felolvasására"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS-beállítások"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS kísérleti adásának megj."</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"A földrengés- és szökőár-figyelmeztető rendszer tesztadásainak megjelenítése"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Extrém veszélyek megjelenítése"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Életre és vagyonra különös módon veszélyt jelentő fenyegetések értesítőinek megjelenítése"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Súlyos veszélyek megjelenítése"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Életre és vagyonra súlyos módon veszélyt jelentő fenyegetések értesítőinek megjelenítése"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER jelzések megjelenítése"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Gyermekrablási vészhelyzetek közleményének megjelenítése (AMBER jelzés)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS kísérleti adásának megj."</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"A Commercial Mobile Alert System (CMAS) kísérleti adásának megjelenítése"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-tesztadások"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"A földrengés- és szökőár-figyelmeztető rendszer (Earthquake Tsunami Warning System, ETWS) tesztadása"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extrém veszélyek"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Életre és tulajdonra extrém veszélyt jelentő fenyegetések"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Komoly veszélyek"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Életre és tulajdonra komoly veszélyt jelentő fenyegetések"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER jelzés (gyermekrablás)"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Gyermekrablási vészhelyzetekről szóló közlemények"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-tesztadások"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"A kereskedelmi mobil figyelmeztető rendszer (Commercial Mobile Alert System, CMAS) tesztadása"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Rezgés"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Teljes hangerő használata"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Mellőz minden más hang- és „Ne zavarjanak”-beállítást"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Területalapú frissítések sugárzása"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"A frissítési adatok megjelenítése a SIM-kártya állapotában"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Területalapú frissítések sugárzása"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"A frissítési adatok megjelenítése a SIM-kártya állapotában"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Fejlesztői beállítások"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Értesítési kategória:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizika"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index d75d4ab..2b49bfb 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Բջջային ցանցի ծանուցումներ"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Կարգավորումներ"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Արտակարգ իրավիճակների ահազանգեր"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Բջջային կապով ծանուցման կարգավորումներն անհասանելի են այս օգտատիրոջ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Եղավ"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Ձեր տարածքում ակտիվ ծանուցումներ չկան։ Ծանուցումների ընտրանքները կարող եք փոխել Կարգավորումներում։"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Արտակարգ իրավիճակի զգուշացում (օպերատոր)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Արտակարգ իրավիճակի ծանուցում"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Հեռարձակման հաղորդագրություններ"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Արտակարգ իրավիճակի ահազանգի կարգավորումներ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Ծանուցումներ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Հեռարձակման հաղորդագրություններ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Միացնել ծանուցումները"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Ցուցադրել արտակարգ ահազանգերի հեռարձակումները"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Զգուշացման հիշեցում"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Թույլատրել ահազանգերը"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Ստանալ արտակարգ իրավիճակների ծանուցումներ"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Հիշեցման ձայնը"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Բարձրաձայնել զգուշացումը"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Օգտագործել տեքստից-խոսքը՝ արտակարգ նախազգուշական հաղորդագրությունները բարձրաձայնելու համար"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS կարգավորումներ"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Ցուցադրել ETWS փարձնական հեռարձակումները"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Ցուցադրել փորձնական հեռարձակումները երկրաշարժի և ցունամիի նախազգուշացնող համակարգի համար"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Ցուցադրել ծայրահեղ սպառնալիքները"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Ցուցադրել կյանքի և գույքի համար ծայրահեղ սպառնալիքները"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Ցուցադրել լուրջ սպառնալիքները"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Ցուցադրել կյանքի և գույքի համար կարևոր ահազանգերը"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Ցուցադրել Amber ծանուցումները"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Ցուցադրել երեխաների առևանգման մասին ծանուցումները (AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Ցուցադրել CMAS փորձնական հեռարձակումները"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Ցուցադրել փորձնական հեռարձակումները առևտրային բջջային ահազանգերի համակարգի համար"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Արտակարգ իրավիճակների արխիվ"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Ծանուցումների կարգավորումներ"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS փորձնական հեռարձակումներ"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Փորձնական հեռարձակումներ երկրաշարժի և ցունամիի նախազգուշացնող համակարգի համար"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Կարևոր ահազանգեր"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ծայրահեղ սպառնալիքներ կյանքի և գույքի համար"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Կարևոր ահազանգեր"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Լուրջ սպառնալիքներ կյանքի և գույքի համար"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER ծանուցումներ"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Հաղորդումներ երեխաների առևանգման մասին"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS փորձնական հեռարձակումներ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Փորձնական հեռարձակումներ բջջային գովազդային ահազանգերի համակարգի համար"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Թրթռոց"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Օգտագործել ձայնի ողջ ուժգնությունը"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Անտեսել ձայնի ուժգնության և Չանհանգստացնել ռեժիմի այլ կարգավորումները"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Տարածքի թարմացված տվյալների հեռարձակումներ"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Թարմացման մասին տեղեկությունները ցուցադրել SIM-ի կարգավիճակում"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Տեղական ծանուցող հեռարձակումներ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Թարմացման մասին տեղեկությունը ցուցադրել SIM քարտի կարգավիճակում"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Մշակողի ընտրանքներ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Զգուշացման բաժինը՝"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Երկրաֆիզիկական"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 556ff4b..d8765f0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Siaran Seluler"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Setelan Siaran Sel"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Notifikasi darurat"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Setelan Siaran Sel tidak tersedia untuk pengguna ini"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Oke"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Tidak ada peringatan aktif di wilayah Anda. Anda dapat mengubah setelan Peringatan menggunakan opsi menu Setelan."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Peringatan darurat (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Lansiran darurat"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Pesan broadcast"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Setelan pemberitahuan darurat"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Notifikasi"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Pesan broadcast"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Aktifkan pemberitahuan"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Tampilkan siaran lansiran darurat"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Pengingat pemberitahuan"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Izinkan notifikasi"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Terima notifikasi darurat"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Bunyi pengingat notifikasi"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ucapkan pesan lansiran"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Gunakan text-to-speech untuk mengucapkan pesan lansiran darurat"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Setelan ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Tampilkan tes siaran ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Tampilkan siaran uji untuk Sistem Peringatan Tsunami Gempa Bumi"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Tampilkan ancaman ekstrem"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Tampilkan peringatan untuk ancaman ekstrem bagi nyawa dan harta"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Tampilkan ancaman berbahaya"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Tampilkan peringatan untuk ancaman berbahaya bagi nyawa dan harta"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Tampilkan peringatan AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Tampilkan buletin keadaan darurat penculikan anak (peringatan AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Tampilkan tes siaran CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Tampilkan tes siaran untuk Sistem Peringatan Seluler Komersial"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Histori notifikasi darurat"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferensi notifikasi"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Broadcast uji ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Broadcast uji untuk Sistem Peringatan Tsunami Gempa Bumi"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ancaman ekstrem"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ancaman ekstrem terhadap nyawa dan harta"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ancaman berat"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ancaman berat terhadap nyawa dan harta"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Notifikasi AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Pesan darurat penculikan anak"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Broadcast uji CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Broadcast uji untuk Sistem Notifikasi Seluler Komersial"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Getar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Gunakan volume penuh"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Abaikan volume lain dan preferensi Jangan Ganggu"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Siaran update area"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Tampilan informasi update di status SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Siaran update area"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Tampilan informasi update di status SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opsi developer"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategori Lansiran:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisika"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Saat ini Anda menerima Lansiran Darurat. Apakah Anda ingin terus menerima Lansiran Darurat?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ya"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Tidak"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Riwayat notifikasi darurat"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Histori notifikasi darurat"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Satu kali"</item>
     <item msgid="9097229303902157183">"Setiap 2 menit"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 6951831..a4d23aa 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Skilaboð frá endurvarpa"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Stillingar skilaboða frá endurvarpa"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Neyðartilkynningar"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Stillingar endurvarpa eru ekki í boði fyrir þennan notanda"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Í lagi"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Engar virkar viðvaranir á þínu svæði. Þú getur breytt stillingum viðvarana undir valmyndarkostinum Stillingar."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Neyðarviðvörun (símafyrirtæki)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Neyðarviðvörun"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Útsendingarskilaboð"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Stillingar neyðarviðvarana"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Tilkynningar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Útsendingarskilaboð"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Kveikja á tilkynningum"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Sýna neyðarviðvaranir"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Áminning"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Leyfa tilkynningar"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Fá neyðartilkynningar"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Áminningarhljóð"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Lesa upp viðvörunarskilaboð"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Nota talgervil til að lesa skilaboð neyðarviðvarana upphátt"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS-stillingar"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Sýna ETWS-prufuútsendingar"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Sýna prufuútsendingar fyrir viðvaranir um jarðskjálfta og flóð (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Sýna alvarlegar ógnir"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Sýna viðvaranir þegar lífi eða eignum er stefnt í mikla hættu"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Sýna alvarlegar ógnir"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Sýna viðvaranir þegar lífi eða eignum er stefnt í alvarlega hættu"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Sýna AMBER-viðvaranir"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Sýna neyðartilkynningar um brottnám barna (AMBER-viðvaranir)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Sýna CMAS-prufuútsendingar"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Sýna prufuútsendingar CMAS-kerfisins (Commercial Mobile Alert System)"</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">"Þ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">"Þegar líf eða eignir eru í 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_cmas_test_alerts_title" msgid="9000272842269750162">"Prufuútsendingar CMAS-kerfisins"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Prufuútsendingar CMAS-kerfisins (Commercial Mobile Alert System)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Titringur"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Nota fullan hljóðstyrk"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Hunsa aðrar stillingar fyrir hljóðstyrk og „Ónáðið ekki“"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Staðbundnar uppfærslur"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Sýna uppfærsluupplýsingar í SIM-stöðu"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Staðbundnar uppfærslur"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Sýna uppfærsluupplýsingar í SIM-stöðu"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Forritunarkostir"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Flokkur viðvörunar:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Jarðeðlisfræði"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7695a70..814f18d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell broadcast"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Impostazioni cell broadcast"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Avvisi di emergenza"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Le impostazioni di cell broadcast non sono disponibili per questo utente"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Non ci sono avvisi attivi nella tua zona. Puoi modificare le impostazioni degli avvisi utilizzando l\'opzione di menu Impostazioni."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Avviso di emergenza (operatore)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Avviso di emergenza"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Messaggi broadcast"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Impostazioni avvisi di emergenza"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Avvisi"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Messaggi broadcast"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Attiva notifiche"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Visualizza trasmissioni di avvisi di emergenza"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Promemoria avvisi"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Consenti avvisi"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Ricevi notifiche sulle emergenze"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Suono promemoria degli avvisi"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Enuncia messaggio di avviso"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Utilizza la sintesi vocale per enunciare i messaggi degli avvisi di emergenza"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Impostazioni ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Mostra trasmissioni di prova ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Visualizza le trasmissioni di prova per il sistema di avviso tsunami e terremoto"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Mostra minacce estreme"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Mostra avvisi relativi a minacce estreme alla vita e alle proprietà"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Mostra minacce gravi"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Mostra avvisi relativi a minacce gravi alla vita e alle proprietà"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Mostra avvisi AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Mostra bollettini di emergenza rapimento bambini (AMBER Alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Mostra trasmissioni di prova CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Mostra trasmissioni di prova relative a Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Cronologia degli avvisi di emergenza"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Preferenze per gli avvisi"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Trasmissioni di prova ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Trasmissioni di prova per il sistema di avviso tsunami e terremoto"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Minacce estreme"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Minacce estreme alla vita e alle proprietà"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Minacce gravi"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Minacce gravi alla vita e alle proprietà"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Avvisi AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bollettini di emergenza rapimento bambini"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Trasmissioni di prova CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Trasmissioni di prova per il sistema di avvisi tramite la rete mobile"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrazione"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usa volume massimo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignora altre preferenze per Volume e Non disturbare"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Trasmissioni degli aggiornamenti relativi alla zona"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostra le informazioni di aggiornamento nello stato della SIM"</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="category_dev_settings_title" msgid="6194393458398329994">"Opzioni sviluppatore"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria avviso:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofisici"</string>
@@ -114,6 +115,6 @@
     <item msgid="9097229303902157183">"Ogni 2 minuti"</item>
     <item msgid="5718214950343391480">"Ogni 5 minuti"</item>
     <item msgid="3863339891188103437">"Ogni 15 minuti"</item>
-    <item msgid="6868848414437854609">"Disattivati"</item>
+    <item msgid="6868848414437854609">"Disattivato"</item>
   </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6b57704..d10cc27 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"שידורים סלולריים"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"הגדרות שידורים סלולריים"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"התרעות חירום"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"הגדרות של שידור סלולרי אינן זמינות עבור המשתמש הזה"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"אישור"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"אין התרעות פעילות באזור שלך. ניתן לשנות את ההגדרות של \'התרעה\' דרך תפריט \'הגדרות\'."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"התרעת חירום (מפעיל)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"התרעת חירום"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"הודעות שידור"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"הגדרות התרעת חירום"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"התרעות"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"הודעות שידור"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"הפעל התרעות"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"הצג שידורי התרעות חירום"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"תזכורת התרעה"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"הצגת התרעות"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"אני רוצה לקבל התרעות חירום"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"הצליל של תזכורות ההתרעה"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"הודעת התרעה תושמע בקול"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"השתמש בטקסט לדיבור כדי להגיד בקול הודעות של התרעת חירום"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"‏הגדרות ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"‏הצג שידורי בדיקה של ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"הצג שידורי בדיקה של מערכת ההתראות על צונאמי ורעידות אדמה"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"איומים קיצוניים"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"הצג התרעות על איומים קיצוניים לנפש ולרכוש"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"איומים חמורים"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"הצג התרעות על איומים חמורים לנפש ולרכוש"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"‏התרעות AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"‏הצג מבזקי חירום על חטיפת ילדים (התרעת AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"‏הצג שידורי בדיקה של CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"‏הצג שידורי בדיקה של Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"היסטוריה של התרעות חירום"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"העדפות התרעה"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"‏שידורי בדיקה של ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"שידורי בדיקה של מערכת ההתראות על צונאמי ורעידות אדמה"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"איומים קיצוניים"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"איומים קיצוניים לנפש ולרכוש"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"איומים חמורים"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"איומים חמורים לנפש ולרכוש"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏התרעות AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"מבזקי חירום על חטיפת ילדים"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"‏שידורי בדיקה של CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"‏שידורי בדיקה של Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"רטט"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"השתמש בעוצמת קול מלאה"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"התעלם מהעדפות אחרות של עוצמת הקול והמצב \'נא לא להפריע\'"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"שידורי עדכונים רלוונטיים לאזור"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"‏הצגת פרטי עדכון בסטטוס SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"שידורי עדכונים רלוונטיים לאזור"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"‏הצגה של פרטי עדכון בסטטוס ה-SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"אפשרויות מפתח"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"קטגוריית התרעה:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"גיאופיזית"</string>
@@ -101,14 +102,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="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="4370292554938680862">"‏הצג תיבת דו שיח לביטול הסכמה לאחר הצגת התרעת CMAS הראשונה (מלבד התרעה נשיאותית)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"הצג תיבת דו שיח לביטול הסכמה"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"נכון לעכשיו אתה מקבל התראות חירום. האם ברצונך להמשיך לקבל התראות חירום?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"נכון לעכשיו אתה מקבל התרעות חירום. האם ברצונך להמשיך לקבל התרעות חירום?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"כן"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"לא"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"היסטוריה של התראות חירום"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"היסטוריה של התרעות חירום"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"פעם אחת"</item>
     <item msgid="9097229303902157183">"כל שתי דקות"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8693ae4..58affa3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"緊急速報メール"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"緊急速報メールの設定"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"緊急速報メール"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"緊急速報メールの設定は現在のユーザーでは利用できません"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"受信したメッセージはありません。[設定] メニュー オプションより緊急速報メールの設定を変更できます。"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急速報メール(オペレーター)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"緊急速報メール"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"緊急速報メール SMS"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"緊急速報メールの設定"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"緊急速報メール"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ブロードキャスト メッセージ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"緊急速報メールを受信する"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"緊急速報メールを受信し内容を表示する"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"メッセージ受信を再通知する"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"緊急速報メールの許可"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"緊急速報メールの受信"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"緊急速報メール着信音"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"受信時にメッセージを読み上げる"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"緊急速報メール受信時にメッセージを読み上げる"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWSの設定"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS 試験メッセージを受信する"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"緊急速報メールの ETWS 試験メッセージを受信する"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"極めて重大な脅威を表示する"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"命や財産に関わる極めて重大な脅威への警報を表示する"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"重大な脅威を表示する"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"命や財産に関わる重大な脅威への警報を表示する"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"誘拐事件速報を表示する"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"児童誘拐警報の速報(アンバーアラート)を表示する"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS 試験メッセージを受信する"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"CMAS 試験メッセージを受信する"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"緊急速報メールの履歴"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"緊急速報メール設定"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS のテスト放送"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"地震津波警報システムのテスト放送"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"極めて重大な脅威"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"命や財産に関わる極めて重大な脅威"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"重大な脅威"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"命や財産に関わる重大な脅威"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"誘拐事件速報"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"児童誘拐警報の速報"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS のテスト放送"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Commercial Mobile Alert System のテスト放送"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"バイブレーション"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"最大音量を使用する"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"その他の音量やマナーモードの設定は無視されます"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"エリア更新メッセージ"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM ステータスに更新情報を表示します"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"エリア更新メッセージ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM ステータスに更新情報を表示します"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"開発者向けオプション"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"警報のカテゴリ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"地球物理"</string>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index b99cdde..53c0d94 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell Broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"სამაუწყებლო შეტყობინებების პარამეტრები"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"საგანგებო გაფრთხილებები"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Cell Broadcast პარამეტრები ამ მომხმარებლისათვის მიუწვდომელია"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"კარგი"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"თქვენს ზონაში არ არის აქტიური გაფრთხილებები. გაფრთხილებების პარამეტრების შეცვლა შეგიძლიათ მენიუს ფუნქციის „პარამეტრები“ საშუალებით."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"საგანგებო ვითარების შესახებ გაფრთხილება (ოპერატორი)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"საგანგებო გაფრთხილება"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"შეტყობინებათა გავრცელება"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"საგანგებო ვითარების გაფრთხილებების პარამეტრები"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"გაფრთხილებები"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast შეტყობინებები"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"შეტყობინებების ჩართვა"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"საგანგებო ვითარების შესახებ ქსელის შეტყობინებების ჩვენება"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"გაფრთხილება"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"გაფრთხილებების დაშვება"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"საგანგებო შეტყობინებების მიღება"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"გაფრთხილებათა შეხსენებების ხმა"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"საგანგებო შეტყობნების წარმოთქმა"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"საგანგებო ვითარების შესახებ გაფრთხილებების შეტყობინებებზე ტექსტის წაკითხვის ფუნქციის გამოყენება"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS-ის პარამეტრები"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ქსელის ETWS ტესტირების შესახებ შეტყობინებების ჩვენება"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"მიწისძვრის და ცუნამის თაობაზე გაფრთხილების სისტემის ტესტირების შესახებ შეტყობინებების ჩვენება"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"უკიდურესი საფრთხეების ჩვენება"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"სიცოცხლისა და საკუთრებისადმი შექმნილი უკიდურესი საფრთხის შესახებ გაფრთხილებების ჩვენება"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"სერიოზული საფრთხეების ჩვენება"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"სიცოცხლისა და საკუთრებისადმი შექმნილი სერიოზული საფრთხის შესახებ გაფრთხილებების ჩვენება"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"„AMBER Alert“-ის განცხადებების ჩვენება"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"„AMBER Alert“-ის განცხადებების ჩვენება (ბავშბის გატაცების შესახებ საგანგებო შეტყობინება)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"ქსელის CMAS ტესტირების შესახებ შეტყობინებების ჩვენება"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"კომერციული მობილური გაფრთხილების სისტემის ტესტირების შესახებ შეტყობინებების ჩვენება"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"საგანგებო გაფრთხილებათა ისტორია"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"გაფრთხილებათა პარამეტრები"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-ის შეტყობინებათა სატესტო გავრცელება"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"მიწისძვრისა და ცუნამის თაობაზე გაფრთხილების სისტემის შეტყობინებათა სატესტო გავრცელება"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"უკიდურესად მძაფრი საფრთხეები"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"უკიდურესად მძაფრი საფრთხეები სიცოცხლისა და საკუთრებისადმი"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"მწვავე საფრთხეები"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"მწვავე საფრთხეები სიცოცხლის და საკუთრებისადმი"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-ის გაფრთხილებები"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"საგანგებო შეტყობინებები ბავშვთა გატაცებების შესახებ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-ის შეტყობინებათა სატესტო გავრცელება"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"კომერციული მობილური გაფრთხილების სისტემის შეტყობინებათა სატესტო გავრცელება"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ვიბრაცია"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"სრული ხმის გამოყენება"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ხმის დამატებითი პარამეტრების და „არ შემაწუხოთ“ პარამეტრის იგნორირება"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"მდებარეობაზე მორგებული განახლებების მიღება"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"განახლების ინფორმაციის SIM ბარათის სტატუსში ჩვენება"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"მდებარეობაზე მორგებული განახლებების მიღება"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"განახლების ინფორმაციის SIM ბარათის სტატუსში ჩვენება"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"პარამეტრები დეველოპერებისთვის"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"გაფრთხილების კატეგორია:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"გეოფიზიკური"</string>
@@ -111,7 +112,7 @@
     <string name="cb_list_activity_title" msgid="1433502151877791724">"საგანგებო გაფრთხილებათა ისტორია"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ერთხელ"</item>
-    <item msgid="9097229303902157183">"ყოველ 2 წუთში ერთხელ"</item>
+    <item msgid="9097229303902157183">"ყოველ 2 წუთში"</item>
     <item msgid="5718214950343391480">"ყოველ 5 წუთში"</item>
     <item msgid="3863339891188103437">"ყოველ 15 წუთში"</item>
     <item msgid="6868848414437854609">"გამორთული"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 96610f7..1c75597 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell Broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Ұялы таратылым параметрлері"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Төтенше хабарламалар"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Ұялы таратылым параметрлері осы пайдаланушы үшін қол жетімді емес"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Жарайды"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Сіздің аймағыңызда белсенді дабылдар жоқ. Дабыл параметрлерін «Параметрлер» мәзір опциясы арқылы өзгертуге болады."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Сіздің аймағыңызда белсенді хабарламалар жоқ. Хабарлама параметрлерін «Параметрлер» мәзір опциясы арқылы өзгертуге болады."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Параметрлер"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Таратылымдарды жою"</string>
     <string name="message_options" msgid="3178489901903589574">"Хабар опциялары"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Төтенше дабыл (оператор)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Төтенше дабыл"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Таратылым хабарлары"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Төтенше дабыл параметрлері"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Хабарламалар"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Таратылым хабарлары"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Хабарландыруларды іске қосу"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Төтенше дабыл таратылымдарын көрсету"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Дабыл еске салғышы"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Хабарламаларға рұқсат беру"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Төтенше жағдай хабарландырулары"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Еске салғыштың дыбысы"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Дабыл хабарын ауызша айту"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Төтенше дабыл хабарларын ауызша айту үшін мәтінді дыбысқа түрлендіру функциясын пайдаланыңыз"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS параметрлері"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS сынақ таратылымд.көрсету"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Earthquake Tsunami Warning System жүйесі үшін сынақ таратылымдарын көрсету"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Аса маңызды қауіптерді көрсету"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Өмір мен мүлік үшін аса маңызды қауіптер дабылдарын көрсету"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Елеулі қауіптерді көрсету"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Өмір мен мүлік үшін елеулі қауіп дабылдарын көрсету"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"САРЫ дабылдарды көрсету"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Бала ұрлау туралы төтенше бюллетендерді көрсету (САРЫ дабыл)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS сынақ таратылымдарын көрсету"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Commercial Mobile Alert System жүйесі үшін сынақ таратылымдарын көрсету"</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">"Earthquake Tsunami Warning System жүйесі үшін сынақ таратылымдарын көрсету"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Үлкен қауіптер"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Өмірге және мүлікке төнген үлкен қауіптер"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ауыр қауіптер"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Өмірге және мүлікке төнген ауыр қауіптер"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER хабарламалары"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Бала ұрлау туралы төтенше бюллетеньдер"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS сынақ таратылымдары"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Commercial Mobile Alert System жүйесі үшін сынақ таратылымдарын көрсету"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Дірілдеу"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Толық көлемін пайдалану"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Басқа көлемді және \"Мазаламаңыз\" параметрлерін елемеу"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Жергілікті жаңартылған ақпаратты тарату"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM күйінде жаңарту ақпаратын көрсету"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Жергілікті жаңартылған ақпаратты тарату"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM күйінде жаңарту ақпаратын көрсету"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Дамытушы опциялары"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Дабыл санаты:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизикалық"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Сіз қазір төтенше дабылдарды қабылдап жатырсыз. Төтенше дабылдар қабылдауды жалғастырғыңыз келе ме?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Иә"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Жоқ"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Төтенше дабыл тарихы"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Төтенше хабарлама тарихы"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Бір рет"</item>
     <item msgid="9097229303902157183">"2 минут сайын"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index ef98906..682a361 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"ការ​ផ្សាយ​ចល័ត"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"កំណត់​ការ​ផ្សាយ​ចល័ត"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"ការជូន​ដំណឹង​ពេលអាសន្ន"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ការ​កំណត់​ប្រកាស​ចល័ត​មិន​អាច​ប្រើ​បាន​សម្រាប់​អ្នក​ប្រើ​នេះ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"យល់​ព្រម​"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"មិន​មាន​ការ​ជូន​ដំណឹង​សកម្ម​ក្នុង​តំបន់​របស់​អ្នក​ទេ។ អ្នក​អាច​ប្ដូរ​ការ​កំណត់ការ​ជូនដំណឹង​ ដោយ​ប្រើ​ជម្រើស​ម៉ឺនុយ​ការ​កំណត់។"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន (ប្រតិបត្តិ​ករ)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"ការ​ជូន​ដំណឹង​ពេល​អាសន្ន"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"សារ​ផ្សព្វផ្សាយ"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"កំណត់​ការ​ជូន​ដំណឹង​ពេល​អាសន្ន"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"ការជូនដំណឹង"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"សារ​ផ្សព្វផ្សាយ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"បើក​ការ​ជូន​ដំណឹង​"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"បង្ហាញ​ការ​ផ្សាយ​ជូន​ដំណឹង​ពេល​មាន​អាសន្ន"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ជូន​ដំណឹង"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"អនុញ្ញាតការជូនដំណឹង"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"ទទួលការជូនដំណឹងពេលអាសន្ន"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"សំឡេងការរំលឹកការជូនដំណឹង"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"អាន​​សារ​ជូន​ដំណឹង"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"ប្រើ​អត្ថបទ​​ត្រូវ​​និយាយ​ ដើម្បី​​​អាន​សារ​ជូន​ដំណឹង​ពេល​មាន​អាសន្ន"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ការ​កំណត់ ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"បង្ហាញ​​ការ​ផ្សាយ​សាកល្បង ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"បង្ហាញ​ការ​ផ្សាយ​សាកល្បង​សម្រាប់​​ប្រព័ន្ធ​​ការ​ព្រមាន​ពី​ការ​រញ្ជួយ​ដី​​​រលក​យក្ស​ស៊ូ​ណាមិ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"បង្ហាញ​ការ​គំរាម​កំហែងខ្លាំងបំផុត"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"បង្ហាញ​ការ​ជូន​ដំណឹងចំពោះការ​គំរាមកំហែង​ខ្លាំងបំផុតដល់អាយុជីវិត និង​ទ្រព្យសម្បត្តិ"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"បង្ហាញ​ការ​គំរាម​កំហែងធ្ងន់ធ្ងរ"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"បង្ហាញ​ការ​ជូន​ដំណឹង​ចំពោះ​ការ​គំរាមកំហែងធ្ងន់ធ្ងរ​ដល់​អាយុជីវិត និង​ទ្រព្យសម្បត្តិ"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"បង្ហាញ​ការ​​​ជូន​ដំណឹង​ពណ៌​លឿង"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"បង្ហាញ​​ព្រឹត្តិបត្រ​ព័ត៌មាន​ពេល​អាសន្ន​មាន​ការ​ចាប់​ជំរិត​ក្មេង​​ (ជូន​ដំណឹង​ពណ៌​លឿង)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"បង្ហាញ​ការ​ផ្សាយ​សាកល្បង CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"បង្ហាញ​ការផ្សាយ​​សាកល្បង​សម្រាប់​ប្រព័ន្ធ​ជូន​ដំណឹង​ចល័ត​ទាក់ទង​ពាណិជ្ជកម្ម"</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">"ការ​ផ្សាយ​សាកល្បង​សម្រាប់​ Earthquake Tsunami Warning System"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"ការ​គំរាមកំហែង​ធ្ងន់ធ្ងរបំផុត"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ការគំរាមកំហែងដល់អាយុជីវិត និងទ្រព្យសម្បត្តិដ៏ធ្ងន់ធ្ងរបំផុត"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ការ​គំរាម​កំហែង​ធ្ងន់ធ្ងរ"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ការគំរាមកំហែងដល់អាយុជីវិត និងទ្រព្យសម្បត្តិដ៏ធ្ងន់ធ្ងរ"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"ការ​ជូនដំណឹងពណ៌លឿង"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ព្រឹត្តិបត្រអាសន្ន​អំពី​ការចាប់ជំរិត​ក្មេង"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"ការផ្សាយ​សាកល្បងរបស់ CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"​ការផ្សាយ​សាកល្បង​សម្រាប់ Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ញ័រ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ប្រើកម្រិតសំឡេងពេញ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"មិនអើពើនឹងសំឡេងផ្សេងទៀត និងចំណូល​ចិត្ត​មុខងារ​កុំ​រំខាន"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ការផ្សាយបច្ចុប្បន្នភាពតំបន់"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"បង្ហាញ​ព័ត៌មាន​បច្ចុប្បន្ន​ភាព​នៅ​ក្នុង​ស្ថានភាព​ស៊ីម"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ការផ្សាយបច្ចុប្បន្នភាពតំបន់"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"បង្ហាញ​ព័ត៌មាន​បច្ចុប្បន្ន​ភាព​នៅ​ក្នុង​ស្ថានភាព​ស៊ីម"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ជម្រើស​សម្រាប់​​អ្នក​អភិវឌ្ឍ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ប្រភេទ​រំលឹក៖"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"កត្តា​ភូមិសាស្ត្រ"</string>
@@ -108,10 +109,10 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"បច្ចុប្បន្ន​អ្នក​កំពុង​ទទួល​ការ​ជូន​ដំណឹង​ពេល​អាសន្ន។ តើ​អ្នក​ចង់​បន្ត​ទទួល​ការ​ជូន​ដំណឹង​ពេល​អាសន្ន​ដែរ​ឬទេ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"បាទ/ចាស"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"ទេ"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"ប្រវត្តិដាស់តឿន​ពេលអាសន្ន"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"ប្រវត្តិការជូនដំណឹងពេលអាសន្ន"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ម្ដង"</item>
-    <item msgid="9097229303902157183">"រៀងរាល់ ២​ នាទី"</item>
+    <item msgid="9097229303902157183">"រាល់ 2​ នាទីម្តង"</item>
     <item msgid="5718214950343391480">"រាល់ 5 នាទីម្ដង"</item>
     <item msgid="3863339891188103437">"រាល់ 15 នាទីម្តង"</item>
     <item msgid="6868848414437854609">"បិទ"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index a38e002..ca20e46 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"ಸೆಲ್ ಪ್ರಸಾರಗಳು"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"ಸೆಲ್ ಪ್ರಸಾರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"ತುರ್ತು ಎಚ್ಚರಿಕೆಗಳು"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ಸೆಲ್‌ ಪ್ರಸಾರ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಈ ಬಳಕೆದಾರರಿಗೆ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ಸರಿ"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"ನಿಮ್ಮ ಪ್ರದೇಶದಲ್ಲಿ ಯಾವುದೇ ಸಕ್ರಿಯ ಎಚ್ಚರಿಕೆಗಳಿಲ್ಲ. ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮೆನು ಆಯ್ಕೆ ಬಳಸಿಕೊಂಡು ನೀವು ಎಚ್ಚರಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಬದಲಾಯಿಸಬಹುದು."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ತುರ್ತು ಎಚ್ಚರಿಕೆ (ಆಪರೇಟರ್‌)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"ತುರ್ತು ಎಚ್ಚರಿಕೆ"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ಪ್ರಸಾರ ಸಂದೇಶಗಳು"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"ತುರ್ತು ಎಚ್ಚರಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"ಎಚ್ಚರಿಕೆಗಳು"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ಪ್ರಸಾರ ಸಂದೇಶಗಳು"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಆನ್‌ ಮಾಡಿ"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"ತುರ್ತು ಎಚ್ಚರಿಕೆ ಪ್ರಸಾರಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ಎಚ್ಚರಿಕೆ ಜ್ಞಾಪನೆ"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"ಎಚ್ಚರಿಕೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"ತುರ್ತು ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಿ"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"ಎಚ್ಚರಿಕೆ ಜ್ಞಾಪನೆ ಧ್ವನಿ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ಎಚ್ಚರಿಕೆ ಸಂದೇಶವನ್ನು ಹೇಳಿ"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"ತುರ್ತು ಎಚ್ಚರಿಕೆ ಸಂದೇಶಗಳನ್ನು ಹೇಳಲು ಪಠ್ಯದಿಂದ ಧ್ವನಿಯನ್ನು ಬಳಸಿ"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS ಪರೀಕ್ಷಾ ಪ್ರಸಾರಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"ಭೂಕಂಪ ಸುನಾಮಿ ಮುನ್ನೆಚ್ಚರಿಕೆ ವ್ಯವಸ್ಥೆಯ ಪರೀಕ್ಷಾ ಪ್ರಸಾರಗಳನ್ನು ಪ್ರದರ್ಶಿಸು"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"ತೀವ್ರ ಅಪಾಯಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"ಜೀವ ಮತ್ತು ಆಸ್ತಿಗೆ ಇರುವ ಅಪಾಯಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ಗಂಭೀರ ಅಪಾಯಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"ಜೀವ ಮತ್ತು ಆಸ್ತಿಗೆ ಇರುವ ಗಂಭೀರ ಅಪಾಯಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER ಎಚ್ಚರಿಕೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸು"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"ಮಕ್ಕಳ ಅಪಹರಣ ತುರ್ತು ಕಿರುವರದಿಗಳನ್ನು ತೋರಿಸು (AMBER ಎಚ್ಚರಿಕೆ)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS ಪರೀಕ್ಷಾ ಪ್ರಸಾರಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"ವಾಣಿಜ್ಯ ಮೊಬೈಲ್ ಎಚ್ಚರಿಕೆ ವ್ಯವಸ್ಥೆಯ ಪರೀಕ್ಷಾ ಪ್ರಸಾರಗಳನ್ನು ತೋರಿಸು"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"ತುರ್ತು ಎಚ್ಚರಿಕೆ ಇತಿಹಾಸ"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"ಎಚ್ಚರಿಕೆ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS ಪರೀಕ್ಷಾ ಪ್ರಸಾರಗಳು"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"ಭೂಕಂಪ ಸುನಾಮಿ ಮುನ್ನೆಚ್ಚರಿಕೆ ವ್ಯವಸ್ಥೆಯ ಪರೀಕ್ಷಾ ಪ್ರಸಾರಗಳು"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"ತೀವ್ರ ಬೆದರಿಕೆಗಳು"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ಜೀವ ಮತ್ತು ಆಸ್ತಿಪಾಸ್ತಿಗೆ ತೀವ್ರ ತರದ ಬೆದರಿಕೆಗಳು"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ಗಂಭೀರ ಬೆದರಿಕೆಗಳು"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ಜೀವ ಮತ್ತು ಆಸ್ತಿಪಾಸ್ತಿಗೆ ಗಂಭೀರ ರೀತಿಯ ಬೆದರಿಕೆಗಳು"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER ಎಚ್ಚರಿಕೆಗಳು"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ಮಕ್ಕಳ ಅಪಹರಣ ತುರ್ತು ಕಿರು ಸುದ್ದಿಗಳು"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS ಪರೀಕ್ಷಾ ಪ್ರಸಾರಗಳು"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"ವಾಣಿಜ್ಯ ಮೊಬೈಲ್ ಎಚ್ಚರಿಕೆ ವ್ಯವಸ್ಥೆಗಾಗಿ ಪರೀಕ್ಷಾ ಪ್ರಸಾರಗಳು"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ವೈಬ್ರೇಟ್‌"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ಪೂರ್ಣ ವಾಲ್ಯೂಮ್‌ ಬಳಸಿ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ಇತರೆ ವಾಲ್ಯೂಮ್ ಮತ್ತು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಎಂಬ ಆದ್ಯತೆಗಳನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ಪ್ರದೇಶ ಅಪ್‌ಡೇಟ್‌ ಪ್ರಸಾರಗಳು"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"ಸಿಮ್ ಸ್ಥಿತಿಯಲ್ಲಿ ಅಪ್‌ಡೇಟ್‌‌ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ಪ್ರದೇಶ ಅಪ್‌ಡೇಟ್‌ ಪ್ರಸಾರಗಳು"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"ಸಿಮ್ ಸ್ಥಿತಿಯಲ್ಲಿ ಅಪ್‌ಡೇಟ್‌‌ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ಎಚ್ಚರಿಕೆ ವಿಭಾಗ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ಭೂಭೌತ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3627bd8..465f994 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"셀 브로드캐스트"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"셀 브로드캐스트 설정"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"긴급 경보"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"이 사용자는 셀 브로드캐스트 설정을 사용할 수 없습니다."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"확인"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"사용자 지역에 표시된 경보가 없습니다. 설정 메뉴 옵션을 사용하여 경보 설정을 변경할 수 있습니다."</string>
@@ -36,7 +36,7 @@
     <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_presidential_level_alert" msgid="1209234030582361001">"위급재난문자"</string>
     <string name="cmas_extreme_alert" msgid="2588720613319969289">"비상사태 경보: 긴급"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"비상사태 경보: 심각"</string>
     <string name="cmas_amber_alert" msgid="6154867710264778887">"아동 유괴(황색 경보)"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"비상사태 경보(통신사)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"비상사태 경고"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"브로드캐스트 메시지"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"비상사태 경고 설정"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"경보"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"브로드캐스트 메시지"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"알림 메시지 표시"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"비상사태 경고 브로드캐스트 표시"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"경고 알림"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"경보 허용"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"긴급 알림 수신"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"경보 알림음"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"경고 메시지를 음성 언어로 표시"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"비상사태 경고 메시지를 TTS 기능을 사용하여 음성 언어로 알림"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS 설정"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS 테스트 브로드캐스트 표시"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"지진 해일 경보 시스템용 테스트 브로드캐스트 표시"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"긴급한 위협 표시"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"생명과 재산에 대한 긴급한 위협에 대해 경보 표시"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"심각한 위협 표시"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"생명 및 재산에 대한 심각한 위협에 대해 경보 표시"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"황색 경보 표시"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"아동 유괴 긴급상황 공지 표시(황색 경보)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS 테스트 브로드캐스트 표시"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"모바일 경보 시스템(CMAS)에 대한 테스트 브로드캐스트 표시"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"긴급 경보 내역"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"경보 환경설정"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS 테스트 브로드캐스트"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"지진 해일 경보 시스템용 테스트 브로드캐스트"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"긴급한 위협"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"생명 및 재산에 대한 긴급한 위협"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"심각한 위협"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"생명 및 재산에 대한 심각한 위협"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"황색 경보"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"아동 유괴 긴급상황 공지"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS 테스트 브로드캐스트"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"모바일 경보 시스템(CMAS)용 테스트 브로드캐스트"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"진동"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"최대 볼륨 사용"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"기타 볼륨 및 알림 일시중지 환경설정 무시"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"지역 업데이트 방송"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM 상태의 업데이트 정보를 표시합니다."</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"지역 업데이트 방송"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM 상태에 업데이트 정보 표시"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"개발자 옵션"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"알리미 카테고리:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"지구 물리"</string>
@@ -103,12 +104,12 @@
     <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="4370292554938680862">"대통령령 경보가 아닌 첫 번째 CMAS(민간 이동통신 경보체계) 알림을 표시한 뒤에 선택 해제 대화상자를 표시합니다."</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"위급재난문자가 아닌 첫 번째 CMAS(민간 이동통신 경보체계) 알림을 표시한 뒤에 선택 해제 대화상자를 표시합니다."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"선택 해제 대화상자 표시"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"현재 긴급 알림을 수신하고 있습니다. 긴급 알림을 계속 수신하시겠습니까?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"현재 긴급 경보를 수신하고 있습니다. 긴급 경보를 계속 수신하시겠습니까?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"예"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"아니요"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"비상사태 경고 기록"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"긴급 경보 내역"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"한 번"</item>
     <item msgid="9097229303902157183">"2분마다"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a139215..fb22caf 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Жалпы кулактандыруу"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Жөндөөлөр"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Шашылыш эскертүүлөр"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Бул колдонуучу Уюктук таркатма жөндөөлөрүн колдоно албайт"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Учурда сиз жашаган аймакта эч кандай кулактандыруу жок. Кулактандыруунун жөндөөлөрүн өзгөртүү үчүн \"Жөндөөлөр\" менюсуна өтүңүз."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Өзгөчө кырдаал жөнүндө айгай кабар (оператор)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Өзгөчө кырдаал жөнүндө айгай кабар"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Билдирүүлөрдү таркатуу"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Өзгөчө кырдаал тууралуу кабарлардын түрлөрү"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Эскертүүлөр"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Билдирүүлөрдү таркатуу"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Эскертмелерди күйгүзүү"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Өзгөчө кырдаал жөнүндө айгай таркатмасы көрүнөт"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Кабарлардын мезгилдүүлүгү"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Эскертүүлөрдү алуу"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Шашылыш эскертмелерди алуу"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Эскертүүнүн үнү"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Айгай билдирүүнү угуу"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Өзгөчө кырдаал жөнүндө айгай кабар камтылган билдирүүлөрдү угуу үчүн кеп синтезаторун колдонуңуз"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS жөндөөлөрү"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS сынамык таркатмалары"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Жер титирөө жана цунами жөнүндө эскертүү тутумунун (ETWS) сынамык таркатмалары көрсөтүлөт"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Кескин коркунучтар"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Өмүргө жана мүлккө келтирилген кескин коркунучтар тууралуу кабар берилет"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Олуттуу коркунучтар"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Өмүргө жана мүлккө келтирилген олуттуу коркунучтар жөнүндө кабар берилет"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER кабарлары"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Жоголгон балдар тууралуу кабарлар көрсөтүлөт (AMBER кабары)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS сынамык таркатмалары"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Коммерциялык мобилдик кабар берүү тутумунун (CMAS) сыналып жаткан уюк таркатмасын көрсөтүү"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Өзгөчө кырдаал тууралуу кабарлардын таржымалы"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Эскертүүнүн параметрлери"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS сынамык таркатмалары"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Жер титирөө жана цунами жөнүндө эскертүү тутумунун сынамык таркатмалары"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Кескин коркунучтар"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Өмүргө жана мүлккө келтирилген кескин коркунучтар"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Олуттуу коркунучтар"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Өмүргө жана мүлккө келтирилген олуттуу коркунучтар"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER кулактандыруулары"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Жоголгон балдар тууралуу кабарлар"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS сынамык таркатмалары"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Коммерциялык мобилдик кабар берүү тутумунун сынамык таркатмалары"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Дирилдөө"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Болушунча катуу угуу"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Үн көзөмөлдөгүчүнүн жана \"Тынчымды алба\" функциясынын жөндөөлөрүн көз жаздымда калтыруу"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Аймакты жаңыртуу боюнча таркатмалар"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM-картанын абалы тууралуу жаңыртылган маалымат көрсөтүлсүн"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Аймакты жаңыртуу боюнча таркатмалар"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM-картанын абалы тууралуу жаңыртылган маалымат көрсөтүлсүн"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Иштеп чыгуучунун параметрлери"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Айгай кабарынын категориясы:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизакалык"</string>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index cdcc4d4..219ed16 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"ການແຈ້ງຜ່ານເຄືອຂ່າຍ"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"ການຕັ້ງຄ່າການກະຈາຍຂໍ້ມູນ"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"ການແຈ້ງເຕືອນສຸກເສີນ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"​ການ​ຕັ້ງ​ຄ່າການ​ກະ​ຈາຍ​ຂໍ້​ມູນ​ທາງ​ໂທ​ລະ​ສັບ​ບໍ່​ສາ​ມາດ​ໃຊ້​ໄດ້​ກັບ​ຜູ່​ໃຊ້​ນີ້"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ຕົກລົງ"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"ບໍ່ມີການແຈ້ງເຕືອນທີ່ດຳເນີນຢູ່ໃນພື້ນທີ່ຂອງທ່ານ. ທ່ານສາມາດປ່ຽນການຕັ້ງຄ່າແຈ້ງເຕືອນໄດ້ ໂດຍການນຳໃຊ້ຕົວເລືອກເມນູການຕັ້ງຄ່າ."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ການແຈ້ງເຕືອນສຸກເສີນ (ຜູ່ໃຫ້ບໍລິການ)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"ການແຈ້ງເຕືອນສຸກເສີນ"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ຂໍ້ຄວາມສົ່ງສັນຍານ"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"ຕັ້ງຄ່າການແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"ການເຕືອນ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ຂໍ້ຄວາມສົ່ງສັນຍານ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"ເປີດໃຊ້ການແຈ້ງເຕືອນ"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"ສະແດງການສົ່ງຂໍ້ມູນແຈ້ງເຕືອນສຸກເສີນ"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ການແຈ້ງເຕືອນ"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"ອະນຸຍາດການເຕືອນ"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"ຮັບການແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"ສຽງການເຕືອນ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ເວົ້າຂໍ້ຄວາມແຈ້ງເຕືອນສຸກເສີນ"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"ໃຊ້ການແປງຂໍ້ຄວາມເປັນສຽງເວົ້າ ເພື່ອເວົ້າຂໍ້ຄວາມແຈ້ງເຕືອນສຸກເສີນ"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ການຕັ້ງຄ່າ ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ສະແດງການທົດສອບສົ່ງແຈ້ງເຕືອນ ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"ສະແດງການທົດສອບແຈ້ງເຕືອນ ສຳລັບລະບົບການເຕືອນໄພແຜ່ນດິນໄຫວສຶນາມິ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"ສະແດງເຫດຮ້າຍແຮງ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"ສະແດງການແຈ້ງເຕືອນສຳລັບເຫດຮ້າຍແຮງຕໍ່ຊີວິດ ແລະຊັບສິນ"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ສະແດງເຫດຮຸນແຮງ"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"ສະແດງການແຈ້ງເຕືອນສຳລັບເຫດຮຸນແຮງຕໍ່ຊີວິດ ແລະຊັບສິນ"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"ສະແດງການແຈ້ງເຕືອນ AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"ສະແດງຂ່າວສານການແຈ້ງເຕືອນສຸກເສີນ ກໍລະນີລັກພາໂຕເດັກນ້ອຍ (ການແຈ້ງເຕືອນ AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"ສະແດງການແຈ້ງເຕືອນທົດສອບ CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"ສະແດງການທົດສອບສົ່ງຂໍ້ຄວາມແຈ້ງເຕືອນ ສຳລັບລະບົບການແຈ້ງເຕືອນມືຖືທາງທຸລະກິດ"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"ປະຫວັດການແຈ້ງເຕືອນສຸກເສີນ"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"ການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ການຖ່າຍທອດສັນຍານທົດສອບ ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"ທົດສອບການສົ່ງສັນຍານສຳລັບລະບົບການເຕືອນແຜ່ນດິນໄຫວຊຶນາມິ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"​ໄພ​ຄຸກ​ຄາມ​ຮ້າຍ​ແຮງທີ່ສຸດ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ເປັນອັນຕະລາຍຕໍ່ຊີວິດ ແລະ ຊັບສິນຮ້າຍແຮງທີ່ສຸດ"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"​ໄພ​ຄຸກ​ຄາມ​ຮຸນ​ແຮງ"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ເປັນອັນຕະລາຍຕໍ່ຊີວິດ ແລະ ຊັບສິນຮຸນແຮງ"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"ການ​ແຈ້ງ​ເຕືອນ AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ປະກາດສຸກເສີກການລັກພາຕົວເດັກນ້ອຍ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"ການສົ່ງສັນຍານທົດສອບ CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"ສະແດງການທົດສອບສົ່ງຂໍ້ຄວາມແຈ້ງເຕືອນສຳລັບລະບົບການແຈ້ງເຕືອນມືຖືທາງທຸລະກິດ"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ສັ່ນເຕືອນ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ໃຊ້ລະດັບສຽງເຕັມ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ຍົກເລີກການຕັ້ງຄ່າລະດັບສຽງ ແລະ ຫ້າມລົບກວນອື່ນ"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ການປະກາດອັບເດດພື້ນທີ່"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"ສະແດງຂໍ້ມູນອັບເດດໃນສະຖານະຊິມ"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ການປະກາດອັບເດດພື້ນທີ່"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"ສະແດງຂໍ້ມູນອັບເດດໃນສະຖານະຊິມ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ໂຕເລືອກນັກພັດທະນາ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ໝວດໝູ່ການແຈ້ງເຕືອນ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ທໍລະນີວັດຖຸ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index aec7c72..c831aec 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Tinklo transliacijos"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Tinklo transliacijos nustatymai"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Nepaprastosios padėties įspėjimai"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Transliacijos mobiliuoju nustatymai negalimi šiam naudotojui"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Gerai"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Jūsų srityje nėra aktyvių įspėjimų. Įspėjimų nustatymus galite pakeisti naudodami meniu parinktį „Nustatymai“."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nepaprastasis įspėjimas (operacijos ženklas)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Nepaprastasis įspėjimas"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Transliacijos pranešimai"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Nepaprastųjų įspėjimų nustatymai"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Įspėjimai"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Transliacijos pranešimai"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Įjungti pranešimus"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Pateikti nepaprastųjų įspėjimų transliacijas"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Įspėjimo priminimas"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Leisti įspėjimus"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Gauti nepaprastosios padėties pranešimus"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Įspėjimo priminimo garsas"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Pasakyti įspėjimo pranešimą"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Naudoti „teksto į kalbą“ priemonę, kad būtų galima pasakyti nepaprastųjų įspėjimų pranešimus"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS nustatymai"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Rodyti ETWS bandom. transliac."</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Rodyti įspėjimų apie žemės drebėjimą ir cunamį sistemos bandomąsias transliacijas"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Rodyti ekstremalias grėsmes"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Pateikti įspėjimus apie grėsmę gyvybei ir nuosavybei"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Rodyti rimtas grėsmes"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Pateikti įspėjimus apie rimtą grėsmę gyvybei ir nuosavybei"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Rodyti AMBER įspėjimus"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Pateikti vaiko pagrobimo biuletenius (AMBER įspėjimas)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Rodyti CMAS bandom. transliac."</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Pateikti bandomąsias komercinių įspėjimų mobiliesiems sistemos transliacijas"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS bandomosios transliacijos"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Įspėjimų apie žemės drebėjimą ir cunamį sistemos bandomosios transliacijos"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Didelė grėsmė"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Didelė grėsmė gyvybei ir nuosavybei"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Rimta grėsmė"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Rimta grėsmė gyvybei ir nuosavybei"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER įspėjimai"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Vaikų pagrobimo nepaprastosios padėties biuleteniai"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Bandomosios CMAS transliacijos"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Bandomosios komercinių įspėjimų mobiliesiems sistemos transliacijos"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibruoti"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Naudoti visą garsumą"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignoruoti kitas garsumo ir netrukdymo režimo nuostatas"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Srities atnaujinimo transliacija"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Rodyti naujinio informaciją SIM būsenos srityje"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Srities atnaujinimo transliacija"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Rodyti naujinio informaciją SIM būsenos srityje"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Kūrėjo parinktis"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Įspėjimo kategorija:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizinis"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Šiuo metu gaunate pagalbos įspėjimus. Ar norite toliau gauti pagalbos įspėjimus?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Taip"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ne"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Nepaprastosios padėties įspėjimų istorija"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Nepaprastosios padėties įspėjimų ist."</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Kartą"</item>
     <item msgid="9097229303902157183">"Kas 2 min."</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ba8ac63..4c42947 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Šūnu apraides"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Šūnu apraides iestatījumi"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Ārkārtas brīdinājumi"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Šūnu apraides iestatījumi nav pieejami šim lietotājam."</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Labi"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Jūsu reģionā nav neviena aktīva brīdinājuma. Varat mainīt brīdinājumu iestatījumus, izmantojot izvēlnes opciju Iestatījumi."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Ārkārtas situācijas brīdinājums (operators)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Ārkārtas situācijas brīdinājums"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Apraides ziņojumi"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Ārkārtas situācijas brīdinājumu iestatījumi"</string>
+    <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="enable_emergency_alerts_title" msgid="1411195469162410084">"Ieslēgt paziņojumus"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Rādīt ārkārtas situāciju brīdinājumu apraides"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Atgādinājums ar signālu"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Brīdinājumu saņemšana"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Saņemt ārkārtas paziņojumus"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Atgādinājuma signāls"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ierunāt brīdinājuma ziņojumu"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Izmantot teksta pārveidošanu runā, lai izveidotu ārkārtas situāciju brīdinājumu ziņojumus"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Zemestrīču un cunami brīdin. sistēmas iestatījumi"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Rādīt ETWS testa apraides"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Rādīt zemestrīču un cunami brīdinājumu sistēmas testa apraides"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Rādīt ārkārtas draudus"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Rādīt brīdinājumus par ārkārtas draudiem dzīvībai un īpašumam"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Rādīt nopietnus draudus"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Rādīt brīdinājumus par nopietniem draudiem dzīvībai un īpašumam"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Rādīt AMBER brīdinājumus"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Rādīt bērnu nolaupīšanas ārkārtas gadījumu biļetenus (AMBER brīdinājumus)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Rādīt CMAS testa apraides"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Rādīt komerciālās mobilo ierīču brīdinājumu sistēmas testa apraides"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS testa apraides"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Zemestrīču un cunami brīdinājumu sistēmas testa apraides"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ārkārtas draudi"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ārkārtas draudi dzīvībai un īpašumam"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Nopietni draudi"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Nopietni draudi dzīvībai un īpašumam"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER brīdinājumi"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bērnu nolaupīšanas ārkārtas gadījumu biļeteni"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS testa apraides"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Komerciālās mobilo ierīču brīdinājumu sistēmas testa apraides"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrācija"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Izmantot pilnu skaļumu"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorēt citas skaļuma un režīma “Netraucēt” preferences"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Apgabala atjauninājumu apraide"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Rādīt jaunāko informāciju SIM statusā"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Apgabala atjauninājumu apraide"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Rādīt jaunāko informāciju SIM statusā"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Izstrādātājiem paredzētās opcijas"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Brīdinājuma kategorija:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Ģeofizikāli procesi"</string>
diff --git a/res/values-mcc246-zh-rTW/strings.xml b/res/values-mcc246-zh-rTW/strings.xml
index b6c08a4..b123761 100644
--- a/res/values-mcc246-zh-rTW/strings.xml
+++ b/res/values-mcc246-zh-rTW/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_amber_alerts_title" msgid="4890124669673498133">"LT-安珀警報"</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-安珀警示"</string>
 </resources>
diff --git a/res/values-mcc425-af/config.xml b/res/values-mcc425-af/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-af/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-am/config.xml b/res/values-mcc425-am/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-am/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ar/config.xml b/res/values-mcc425-ar/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ar/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-az/config.xml b/res/values-mcc425-az/config.xml
deleted file mode 100644
index 7196ce3..0000000
--- a/res/values-mcc425-az/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:növ=digər, fövqəladə=yanlış"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-bg/config.xml b/res/values-mcc425-bg/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-bg/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-bn/config.xml b/res/values-mcc425-bn/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-bn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ca/config.xml b/res/values-mcc425-ca/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ca/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-cs/config.xml b/res/values-mcc425-cs/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-cs/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-da/config.xml b/res/values-mcc425-da/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-da/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-de/config.xml b/res/values-mcc425-de/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-de/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-el/config.xml b/res/values-mcc425-el/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-el/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-en-rAU/config.xml b/res/values-mcc425-en-rAU/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-en-rAU/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-en-rGB/config.xml b/res/values-mcc425-en-rGB/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-en-rGB/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-en-rIN/config.xml b/res/values-mcc425-en-rIN/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-en-rIN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-es-rUS/config.xml b/res/values-mcc425-es-rUS/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-es-rUS/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-es/config.xml b/res/values-mcc425-es/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-es/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-et/config.xml b/res/values-mcc425-et/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-et/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-eu/config.xml b/res/values-mcc425-eu/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-eu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-fa/config.xml b/res/values-mcc425-fa/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-fa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-fi/config.xml b/res/values-mcc425-fi/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-fi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-fr-rCA/config.xml b/res/values-mcc425-fr-rCA/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-fr-rCA/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-fr/config.xml b/res/values-mcc425-fr/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-fr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-gl/config.xml b/res/values-mcc425-gl/config.xml
deleted file mode 100644
index de0acd9..0000000
--- a/res/values-mcc425-gl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:tipo=outro, emerxencia=falso"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-gu/config.xml b/res/values-mcc425-gu/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-gu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-hi/config.xml b/res/values-mcc425-hi/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-hi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-hr/config.xml b/res/values-mcc425-hr/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-hr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-hu/config.xml b/res/values-mcc425-hu/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-hu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-hy/config.xml b/res/values-mcc425-hy/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-hy/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-in/config.xml b/res/values-mcc425-in/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-in/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-is/config.xml b/res/values-mcc425-is/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-is/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-it/config.xml b/res/values-mcc425-it/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-it/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-iw/config.xml b/res/values-mcc425-iw/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-iw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ja/config.xml b/res/values-mcc425-ja/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ja/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ka/config.xml b/res/values-mcc425-ka/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ka/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-kk/config.xml b/res/values-mcc425-kk/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-kk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-km/config.xml b/res/values-mcc425-km/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-km/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-kn/config.xml b/res/values-mcc425-kn/config.xml
deleted file mode 100644
index 78af350..0000000
--- a/res/values-mcc425-kn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಇಲ್ಲ"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ko/config.xml b/res/values-mcc425-ko/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ko/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ky/config.xml b/res/values-mcc425-ky/config.xml
deleted file mode 100644
index 4921c1c..0000000
--- a/res/values-mcc425-ky/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=башка, өзгөчө кырдаал=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-lo/config.xml b/res/values-mcc425-lo/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-lo/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-lt/config.xml b/res/values-mcc425-lt/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-lt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-lv/config.xml b/res/values-mcc425-lv/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-lv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-mk/config.xml b/res/values-mcc425-mk/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-mk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ml/config.xml b/res/values-mcc425-ml/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ml/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-mn/config.xml b/res/values-mcc425-mn/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-mn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-mr/config.xml b/res/values-mcc425-mr/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-mr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ms/config.xml b/res/values-mcc425-ms/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ms/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-my/config.xml b/res/values-mcc425-my/config.xml
deleted file mode 100644
index a638269..0000000
--- a/res/values-mcc425-my/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှား"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-nb/config.xml b/res/values-mcc425-nb/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-nb/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ne/config.xml b/res/values-mcc425-ne/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ne/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-nl/config.xml b/res/values-mcc425-nl/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-nl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-pa/config.xml b/res/values-mcc425-pa/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-pa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-pl/config.xml b/res/values-mcc425-pl/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-pl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-pt-rPT/config.xml b/res/values-mcc425-pt-rPT/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-pt-rPT/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-pt/config.xml b/res/values-mcc425-pt/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-pt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ro/config.xml b/res/values-mcc425-ro/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ro/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ru/config.xml b/res/values-mcc425-ru/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ru/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-si/config.xml b/res/values-mcc425-si/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-si/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-sk/config.xml b/res/values-mcc425-sk/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-sk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-sl/config.xml b/res/values-mcc425-sl/config.xml
deleted file mode 100644
index 11d6a48..0000000
--- a/res/values-mcc425-sl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:vrsta=drugo, klic_v_sili=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-sq/config.xml b/res/values-mcc425-sq/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-sq/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-sr/config.xml b/res/values-mcc425-sr/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-sr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-sv/config.xml b/res/values-mcc425-sv/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-sv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-sw/config.xml b/res/values-mcc425-sw/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-sw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ta/config.xml b/res/values-mcc425-ta/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ta/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-te/config.xml b/res/values-mcc425-te/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-te/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-th/config.xml b/res/values-mcc425-th/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-th/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-tl/config.xml b/res/values-mcc425-tl/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-tl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-tr/config.xml b/res/values-mcc425-tr/config.xml
deleted file mode 100644
index 4dca2de..0000000
--- a/res/values-mcc425-tr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:tür=diğer, acil durum=yanlış"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-uk/config.xml b/res/values-mcc425-uk/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-uk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-ur/config.xml b/res/values-mcc425-ur/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-ur/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-uz/config.xml b/res/values-mcc425-uz/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-uz/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-vi/config.xml b/res/values-mcc425-vi/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-vi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-zh-rCN/config.xml b/res/values-mcc425-zh-rCN/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-zh-rCN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-zh-rHK/config.xml b/res/values-mcc425-zh-rHK/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-zh-rHK/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-zh-rTW/config.xml b/res/values-mcc425-zh-rTW/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-zh-rTW/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425-zu/config.xml b/res/values-mcc425-zu/config.xml
deleted file mode 100644
index a9213d9..0000000
--- a/res/values-mcc425-zu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="519281520592692686">"0x0397-0x03A0:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc425/config.xml b/res/values-mcc425/config.xml
index c672bf8..80f3cc8 100644
--- a/res/values-mcc425/config.xml
+++ b/res/values-mcc425/config.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings">
+    <string-array name="additional_cbs_channels_strings" translatable="false">
         <!-- Channel 919 ~ 928 are required by Israel government -->
         <item>0x0397-0x03A0:type=other, emergency=false</item>
     </string-array>
diff --git a/res/values-mcc440-mnc10-af/config.xml b/res/values-mcc440-mnc10-af/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-af/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-am/config.xml b/res/values-mcc440-mnc10-am/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-am/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ar/config.xml b/res/values-mcc440-mnc10-ar/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ar/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-az/config.xml b/res/values-mcc440-mnc10-az/config.xml
deleted file mode 100644
index d94a45b..0000000
--- a/res/values-mcc440-mnc10-az/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:növ=digər, fövqəladə=doğru"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:növ=digər, fövqəladə=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-bg/config.xml b/res/values-mcc440-mnc10-bg/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-bg/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-bn/config.xml b/res/values-mcc440-mnc10-bn/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-bn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ca/config.xml b/res/values-mcc440-mnc10-ca/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ca/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-cs/config.xml b/res/values-mcc440-mnc10-cs/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-cs/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-da/config.xml b/res/values-mcc440-mnc10-da/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-da/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-de/config.xml b/res/values-mcc440-mnc10-de/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-de/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-el/config.xml b/res/values-mcc440-mnc10-el/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-el/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-en-rAU/config.xml b/res/values-mcc440-mnc10-en-rAU/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-en-rAU/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-en-rGB/config.xml b/res/values-mcc440-mnc10-en-rGB/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-en-rGB/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-en-rIN/config.xml b/res/values-mcc440-mnc10-en-rIN/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-en-rIN/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-es-rUS/config.xml b/res/values-mcc440-mnc10-es-rUS/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-es-rUS/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-es/config.xml b/res/values-mcc440-mnc10-es/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-es/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-et/config.xml b/res/values-mcc440-mnc10-et/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-et/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-eu/config.xml b/res/values-mcc440-mnc10-eu/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-eu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-fa/config.xml b/res/values-mcc440-mnc10-fa/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-fa/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-fi/config.xml b/res/values-mcc440-mnc10-fi/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-fi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-fr-rCA/config.xml b/res/values-mcc440-mnc10-fr-rCA/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-fr-rCA/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-fr/config.xml b/res/values-mcc440-mnc10-fr/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-fr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-gl/config.xml b/res/values-mcc440-mnc10-gl/config.xml
deleted file mode 100644
index a011e1c..0000000
--- a/res/values-mcc440-mnc10-gl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:tipo=outro, emerxencia=verdadeiro"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:tipo=outro, emerxencia=verdadeiro"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-gu/config.xml b/res/values-mcc440-mnc10-gu/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-gu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-hi/config.xml b/res/values-mcc440-mnc10-hi/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-hi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-hr/config.xml b/res/values-mcc440-mnc10-hr/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-hr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-hu/config.xml b/res/values-mcc440-mnc10-hu/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-hu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-hy/config.xml b/res/values-mcc440-mnc10-hy/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-hy/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-in/config.xml b/res/values-mcc440-mnc10-in/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-in/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-is/config.xml b/res/values-mcc440-mnc10-is/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-is/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-it/config.xml b/res/values-mcc440-mnc10-it/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-it/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-iw/config.xml b/res/values-mcc440-mnc10-iw/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-iw/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ja/config.xml b/res/values-mcc440-mnc10-ja/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ja/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ka/config.xml b/res/values-mcc440-mnc10-ka/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ka/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-kk/config.xml b/res/values-mcc440-mnc10-kk/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-kk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-km/config.xml b/res/values-mcc440-mnc10-km/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-km/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-kn/config.xml b/res/values-mcc440-mnc10-kn/config.xml
deleted file mode 100644
index 02efc08..0000000
--- a/res/values-mcc440-mnc10-kn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಹೌದು"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಹೌದು"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ko/config.xml b/res/values-mcc440-mnc10-ko/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ko/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ky/config.xml b/res/values-mcc440-mnc10-ky/config.xml
deleted file mode 100644
index 0e12e8c..0000000
--- a/res/values-mcc440-mnc10-ky/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=башка, өзгөчө кырдаал=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=башка, өзгөчө кырдаал=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-lo/config.xml b/res/values-mcc440-mnc10-lo/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-lo/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-lt/config.xml b/res/values-mcc440-mnc10-lt/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-lt/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-lv/config.xml b/res/values-mcc440-mnc10-lv/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-lv/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-mk/config.xml b/res/values-mcc440-mnc10-mk/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-mk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ml/config.xml b/res/values-mcc440-mnc10-ml/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ml/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-mn/config.xml b/res/values-mcc440-mnc10-mn/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-mn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-mr/config.xml b/res/values-mcc440-mnc10-mr/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-mr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ms/config.xml b/res/values-mcc440-mnc10-ms/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ms/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-my/config.xml b/res/values-mcc440-mnc10-my/config.xml
deleted file mode 100644
index 8302e47..0000000
--- a/res/values-mcc440-mnc10-my/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှန်"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှန်"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-nb/config.xml b/res/values-mcc440-mnc10-nb/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-nb/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ne/config.xml b/res/values-mcc440-mnc10-ne/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ne/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-nl/config.xml b/res/values-mcc440-mnc10-nl/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-nl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-pa/config.xml b/res/values-mcc440-mnc10-pa/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-pa/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-pl/config.xml b/res/values-mcc440-mnc10-pl/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-pl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-pt-rPT/config.xml b/res/values-mcc440-mnc10-pt-rPT/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-pt-rPT/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-pt/config.xml b/res/values-mcc440-mnc10-pt/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-pt/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ro/config.xml b/res/values-mcc440-mnc10-ro/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ro/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ru/config.xml b/res/values-mcc440-mnc10-ru/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ru/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-si/config.xml b/res/values-mcc440-mnc10-si/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-si/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-sk/config.xml b/res/values-mcc440-mnc10-sk/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-sk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-sl/config.xml b/res/values-mcc440-mnc10-sl/config.xml
deleted file mode 100644
index c074774..0000000
--- a/res/values-mcc440-mnc10-sl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:vrsta=drugo, klic_v_sili=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:vrsta=drugo, klic_v_sili=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-sq/config.xml b/res/values-mcc440-mnc10-sq/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-sq/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-sr/config.xml b/res/values-mcc440-mnc10-sr/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-sr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-sv/config.xml b/res/values-mcc440-mnc10-sv/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-sv/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-sw/config.xml b/res/values-mcc440-mnc10-sw/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-sw/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ta/config.xml b/res/values-mcc440-mnc10-ta/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ta/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-te/config.xml b/res/values-mcc440-mnc10-te/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-te/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-th/config.xml b/res/values-mcc440-mnc10-th/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-th/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-tl/config.xml b/res/values-mcc440-mnc10-tl/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-tl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-tr/config.xml b/res/values-mcc440-mnc10-tr/config.xml
deleted file mode 100644
index 94a844a..0000000
--- a/res/values-mcc440-mnc10-tr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:tür=diğer, acil durum=doğru"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:tür=diğer, acil durum=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-uk/config.xml b/res/values-mcc440-mnc10-uk/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-uk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-ur/config.xml b/res/values-mcc440-mnc10-ur/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-ur/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-uz/config.xml b/res/values-mcc440-mnc10-uz/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-uz/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-vi/config.xml b/res/values-mcc440-mnc10-vi/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-vi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-zh-rCN/config.xml b/res/values-mcc440-mnc10-zh-rCN/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-zh-rCN/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-zh-rHK/config.xml b/res/values-mcc440-mnc10-zh-rHK/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-zh-rHK/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-zh-rTW/config.xml b/res/values-mcc440-mnc10-zh-rTW/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-zh-rTW/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10-zu/config.xml b/res/values-mcc440-mnc10-zu/config.xml
deleted file mode 100644
index 520eedb..0000000
--- a/res/values-mcc440-mnc10-zu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="6242989219289183758">"0xA001-0xA002:type=other, emergency=true"</item>
-    <item msgid="4633546051297238055">"0xA004-0xA3FF:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc10/config.xml b/res/values-mcc440-mnc10/config.xml
index 7c6e033..106563f 100644
--- a/res/values-mcc440-mnc10/config.xml
+++ b/res/values-mcc440-mnc10/config.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings">
+    <string-array name="additional_cbs_channels_strings" translatable="false">
         <item>0xA001-0xA002:type=other, emergency=true</item>
         <item>0xA004-0xA3FF:type=other, emergency=true</item>
     </string-array>
diff --git a/res/values-mcc440-mnc20-af/config.xml b/res/values-mcc440-mnc20-af/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-af/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-am/config.xml b/res/values-mcc440-mnc20-am/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-am/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ar/config.xml b/res/values-mcc440-mnc20-ar/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ar/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-az/config.xml b/res/values-mcc440-mnc20-az/config.xml
deleted file mode 100644
index 47f4ad1..0000000
--- a/res/values-mcc440-mnc20-az/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:növ=zəlzələ, fövqəladə=doğru"</item>
-    <item msgid="1387817319548337464">"0xAFEE:növ=sunami, fövqəladə=doğru"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:növ=digər, fövqəladə=doğru"</item>
-    <item msgid="3380942736891925761">"0xA802:növ=etws_defolt, fövqəladə=doğru"</item>
-    <item msgid="1799907852167530421">"0xA804:növ=etws_default, fövqəladə=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-bg/config.xml b/res/values-mcc440-mnc20-bg/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-bg/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-bn/config.xml b/res/values-mcc440-mnc20-bn/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-bn/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ca/config.xml b/res/values-mcc440-mnc20-ca/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ca/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-cs/config.xml b/res/values-mcc440-mnc20-cs/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-cs/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-da/config.xml b/res/values-mcc440-mnc20-da/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-da/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-de/config.xml b/res/values-mcc440-mnc20-de/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-de/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-el/config.xml b/res/values-mcc440-mnc20-el/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-el/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-en-rAU/config.xml b/res/values-mcc440-mnc20-en-rAU/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-en-rAU/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-en-rGB/config.xml b/res/values-mcc440-mnc20-en-rGB/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-en-rGB/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-en-rIN/config.xml b/res/values-mcc440-mnc20-en-rIN/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-en-rIN/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-es-rUS/config.xml b/res/values-mcc440-mnc20-es-rUS/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-es-rUS/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-es/config.xml b/res/values-mcc440-mnc20-es/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-es/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-et/config.xml b/res/values-mcc440-mnc20-et/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-et/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-eu/config.xml b/res/values-mcc440-mnc20-eu/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-eu/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-fa/config.xml b/res/values-mcc440-mnc20-fa/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-fa/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-fi/config.xml b/res/values-mcc440-mnc20-fi/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-fi/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-fr-rCA/config.xml b/res/values-mcc440-mnc20-fr-rCA/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-fr-rCA/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-fr/config.xml b/res/values-mcc440-mnc20-fr/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-fr/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-gl/config.xml b/res/values-mcc440-mnc20-gl/config.xml
deleted file mode 100644
index ac91394..0000000
--- a/res/values-mcc440-mnc20-gl/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:tipo=terremoto, emerxencia=verdadeiro"</item>
-    <item msgid="1387817319548337464">"0xAFEE:tipo=tsunami, emerxencia=verdadeiro"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:tipo=outro, emerxencia=verdadeiro"</item>
-    <item msgid="3380942736891925761">"0xA802:tipo=etws_predeterminado, emerxencia=verdadeiro"</item>
-    <item msgid="1799907852167530421">"0xA804:tipo=etws_predeterminado, emerxencia=verdadeiro"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-gu/config.xml b/res/values-mcc440-mnc20-gu/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-gu/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-hi/config.xml b/res/values-mcc440-mnc20-hi/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-hi/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-hr/config.xml b/res/values-mcc440-mnc20-hr/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-hr/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-hu/config.xml b/res/values-mcc440-mnc20-hu/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-hu/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-hy/config.xml b/res/values-mcc440-mnc20-hy/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-hy/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-in/config.xml b/res/values-mcc440-mnc20-in/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-in/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-is/config.xml b/res/values-mcc440-mnc20-is/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-is/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-it/config.xml b/res/values-mcc440-mnc20-it/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-it/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-iw/config.xml b/res/values-mcc440-mnc20-iw/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-iw/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ja/config.xml b/res/values-mcc440-mnc20-ja/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ja/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ka/config.xml b/res/values-mcc440-mnc20-ka/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ka/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-kk/config.xml b/res/values-mcc440-mnc20-kk/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-kk/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-km/config.xml b/res/values-mcc440-mnc20-km/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-km/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-kn/config.xml b/res/values-mcc440-mnc20-kn/config.xml
deleted file mode 100644
index 3dfabcc..0000000
--- a/res/values-mcc440-mnc20-kn/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:ಪ್ರಕಾರ=ಭೂಕಂಪ, ತುರ್ತು=ಹೌದು"</item>
-    <item msgid="1387817319548337464">"0xAFEE:ಪ್ರಕಾರ=ಸುನಾಮಿ, ತುರ್ತು=ಹೌದು"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಹೌದು"</item>
-    <item msgid="3380942736891925761">"0xA802:ಪ್ರಕಾರ=etws_default, ತುರ್ತು=ಹೌದು"</item>
-    <item msgid="1799907852167530421">"0xA804:ಪ್ರಕಾರ=etws_default, ತುರ್ತು=ಹೌದು"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ko/config.xml b/res/values-mcc440-mnc20-ko/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ko/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ky/config.xml b/res/values-mcc440-mnc20-ky/config.xml
deleted file mode 100644
index 76ad1b1..0000000
--- a/res/values-mcc440-mnc20-ky/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=жер титирөө, өзгөчө кырдаал=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=цунами, өзгөчө кырдаал=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=башка, өзгөчө кырдаал=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, өзгөчө кырдаал=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, өзгөчө кырдаал=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-lo/config.xml b/res/values-mcc440-mnc20-lo/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-lo/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-lt/config.xml b/res/values-mcc440-mnc20-lt/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-lt/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-lv/config.xml b/res/values-mcc440-mnc20-lv/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-lv/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-mk/config.xml b/res/values-mcc440-mnc20-mk/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-mk/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ml/config.xml b/res/values-mcc440-mnc20-ml/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ml/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-mn/config.xml b/res/values-mcc440-mnc20-mn/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-mn/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-mr/config.xml b/res/values-mcc440-mnc20-mr/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-mr/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ms/config.xml b/res/values-mcc440-mnc20-ms/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ms/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-my/config.xml b/res/values-mcc440-mnc20-my/config.xml
deleted file mode 100644
index 8269b56..0000000
--- a/res/values-mcc440-mnc20-my/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800- အမျိုးအစား=မြေငလျင်၊ အရေးပေါ် =မှန်"</item>
-    <item msgid="1387817319548337464">"0xAFEE- အမျိုးအစား=ဆူနာမီ၊ အရေးပေါ် =မှန်"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှန်"</item>
-    <item msgid="3380942736891925761">"0xA802- အမျိုးအစား=etws_မူရင်း၊ အရေးပေါ် =မှန်"</item>
-    <item msgid="1799907852167530421">"0xA804- အမျိုးအစား=etws_မူရင်း၊ အရေးပေါ် =မှန်"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-nb/config.xml b/res/values-mcc440-mnc20-nb/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-nb/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ne/config.xml b/res/values-mcc440-mnc20-ne/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ne/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-nl/config.xml b/res/values-mcc440-mnc20-nl/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-nl/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-pa/config.xml b/res/values-mcc440-mnc20-pa/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-pa/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-pl/config.xml b/res/values-mcc440-mnc20-pl/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-pl/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-pt-rPT/config.xml b/res/values-mcc440-mnc20-pt-rPT/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-pt-rPT/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-pt/config.xml b/res/values-mcc440-mnc20-pt/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-pt/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ro/config.xml b/res/values-mcc440-mnc20-ro/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ro/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ru/config.xml b/res/values-mcc440-mnc20-ru/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ru/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-si/config.xml b/res/values-mcc440-mnc20-si/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-si/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-sk/config.xml b/res/values-mcc440-mnc20-sk/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-sk/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-sl/config.xml b/res/values-mcc440-mnc20-sl/config.xml
deleted file mode 100644
index 6647bdb..0000000
--- a/res/values-mcc440-mnc20-sl/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:vrsta=potres, klic_v_sili=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:vrsta=cunami, klic_v_sili=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:vrsta=drugo, klic_v_sili=true"</item>
-    <item msgid="3380942736891925761">"0xA802:vrsta=etws_privzeto, klic_v_sili=true"</item>
-    <item msgid="1799907852167530421">"0xA804:vrsta=etws_privzeto, klic_v_sili=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-sq/config.xml b/res/values-mcc440-mnc20-sq/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-sq/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-sr/config.xml b/res/values-mcc440-mnc20-sr/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-sr/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-sv/config.xml b/res/values-mcc440-mnc20-sv/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-sv/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-sw/config.xml b/res/values-mcc440-mnc20-sw/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-sw/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ta/config.xml b/res/values-mcc440-mnc20-ta/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ta/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-te/config.xml b/res/values-mcc440-mnc20-te/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-te/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-th/config.xml b/res/values-mcc440-mnc20-th/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-th/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-tl/config.xml b/res/values-mcc440-mnc20-tl/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-tl/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-tr/config.xml b/res/values-mcc440-mnc20-tr/config.xml
deleted file mode 100644
index 5f731dd..0000000
--- a/res/values-mcc440-mnc20-tr/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:tür=deprem, acil durum=doğru"</item>
-    <item msgid="1387817319548337464">"0xAFEE:tür=tsunami, acil durum=doğru"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:tür=diğer, acil durum=doğru"</item>
-    <item msgid="3380942736891925761">"0xA802:tür=etws_default, acil durum=doğru"</item>
-    <item msgid="1799907852167530421">"0xA804:tür=etws_varsayılan, acil durum=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-uk/config.xml b/res/values-mcc440-mnc20-uk/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-uk/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-ur/config.xml b/res/values-mcc440-mnc20-ur/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-ur/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-uz/config.xml b/res/values-mcc440-mnc20-uz/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-uz/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-vi/config.xml b/res/values-mcc440-mnc20-vi/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-vi/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-zh-rCN/config.xml b/res/values-mcc440-mnc20-zh-rCN/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-zh-rCN/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-zh-rHK/config.xml b/res/values-mcc440-mnc20-zh-rHK/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-zh-rHK/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-zh-rTW/config.xml b/res/values-mcc440-mnc20-zh-rTW/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-zh-rTW/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20-zu/config.xml b/res/values-mcc440-mnc20-zu/config.xml
deleted file mode 100644
index 87f73c7..0000000
--- a/res/values-mcc440-mnc20-zu/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="5767328405839530491">"0xA800:type=earthquake, emergency=true"</item>
-    <item msgid="1387817319548337464">"0xAFEE:type=tsunami, emergency=true"</item>
-    <item msgid="106337235646452243">"0xAC00-0xAFED:type=other, emergency=true"</item>
-    <item msgid="3380942736891925761">"0xA802:type=etws_default, emergency=true"</item>
-    <item msgid="1799907852167530421">"0xA804:type=etws_default, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc20/config.xml b/res/values-mcc440-mnc20/config.xml
index fe1cfb5..bc6925b 100644
--- a/res/values-mcc440-mnc20/config.xml
+++ b/res/values-mcc440-mnc20/config.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings">
+    <string-array name="additional_cbs_channels_strings" translatable="false">
         <item>0xA800:type=earthquake, emergency=true</item>
         <item>0xAFEE:type=tsunami, emergency=true</item>
         <item>0xAC00-0xAFED:type=other, emergency=true</item>
diff --git a/res/values-mcc440-mnc50-af/config.xml b/res/values-mcc440-mnc50-af/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-af/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-am/config.xml b/res/values-mcc440-mnc50-am/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-am/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ar/config.xml b/res/values-mcc440-mnc50-ar/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ar/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-az/config.xml b/res/values-mcc440-mnc50-az/config.xml
deleted file mode 100644
index 86016a7..0000000
--- a/res/values-mcc440-mnc50-az/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:növ=digər, fövqəladə=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-bg/config.xml b/res/values-mcc440-mnc50-bg/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-bg/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-bn/config.xml b/res/values-mcc440-mnc50-bn/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-bn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ca/config.xml b/res/values-mcc440-mnc50-ca/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ca/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-cs/config.xml b/res/values-mcc440-mnc50-cs/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-cs/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-da/config.xml b/res/values-mcc440-mnc50-da/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-da/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-de/config.xml b/res/values-mcc440-mnc50-de/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-de/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-el/config.xml b/res/values-mcc440-mnc50-el/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-el/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-en-rAU/config.xml b/res/values-mcc440-mnc50-en-rAU/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-en-rAU/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-en-rGB/config.xml b/res/values-mcc440-mnc50-en-rGB/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-en-rGB/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-en-rIN/config.xml b/res/values-mcc440-mnc50-en-rIN/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-en-rIN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-es-rUS/config.xml b/res/values-mcc440-mnc50-es-rUS/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-es-rUS/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-es/config.xml b/res/values-mcc440-mnc50-es/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-es/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-et/config.xml b/res/values-mcc440-mnc50-et/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-et/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-eu/config.xml b/res/values-mcc440-mnc50-eu/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-eu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-fa/config.xml b/res/values-mcc440-mnc50-fa/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-fa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-fi/config.xml b/res/values-mcc440-mnc50-fi/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-fi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-fr-rCA/config.xml b/res/values-mcc440-mnc50-fr-rCA/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-fr-rCA/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-fr/config.xml b/res/values-mcc440-mnc50-fr/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-fr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-gl/config.xml b/res/values-mcc440-mnc50-gl/config.xml
deleted file mode 100644
index 976408c..0000000
--- a/res/values-mcc440-mnc50-gl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:tipo=outro, emerxencia=verdadeiro"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-gu/config.xml b/res/values-mcc440-mnc50-gu/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-gu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-hi/config.xml b/res/values-mcc440-mnc50-hi/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-hi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-hr/config.xml b/res/values-mcc440-mnc50-hr/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-hr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-hu/config.xml b/res/values-mcc440-mnc50-hu/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-hu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-hy/config.xml b/res/values-mcc440-mnc50-hy/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-hy/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-in/config.xml b/res/values-mcc440-mnc50-in/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-in/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-is/config.xml b/res/values-mcc440-mnc50-is/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-is/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-it/config.xml b/res/values-mcc440-mnc50-it/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-it/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-iw/config.xml b/res/values-mcc440-mnc50-iw/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-iw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ja/config.xml b/res/values-mcc440-mnc50-ja/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ja/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ka/config.xml b/res/values-mcc440-mnc50-ka/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ka/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-kk/config.xml b/res/values-mcc440-mnc50-kk/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-kk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-km/config.xml b/res/values-mcc440-mnc50-km/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-km/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-kn/config.xml b/res/values-mcc440-mnc50-kn/config.xml
deleted file mode 100644
index 7ca542b..0000000
--- a/res/values-mcc440-mnc50-kn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಹೌದು"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ko/config.xml b/res/values-mcc440-mnc50-ko/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ko/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ky/config.xml b/res/values-mcc440-mnc50-ky/config.xml
deleted file mode 100644
index a73f539..0000000
--- a/res/values-mcc440-mnc50-ky/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=башка, өзгөчө кырдаал=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-lo/config.xml b/res/values-mcc440-mnc50-lo/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-lo/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-lt/config.xml b/res/values-mcc440-mnc50-lt/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-lt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-lv/config.xml b/res/values-mcc440-mnc50-lv/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-lv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-mk/config.xml b/res/values-mcc440-mnc50-mk/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-mk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ml/config.xml b/res/values-mcc440-mnc50-ml/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ml/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-mn/config.xml b/res/values-mcc440-mnc50-mn/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-mn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-mr/config.xml b/res/values-mcc440-mnc50-mr/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-mr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ms/config.xml b/res/values-mcc440-mnc50-ms/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ms/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-my/config.xml b/res/values-mcc440-mnc50-my/config.xml
deleted file mode 100644
index 438e23b..0000000
--- a/res/values-mcc440-mnc50-my/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှန်"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-nb/config.xml b/res/values-mcc440-mnc50-nb/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-nb/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ne/config.xml b/res/values-mcc440-mnc50-ne/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ne/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-nl/config.xml b/res/values-mcc440-mnc50-nl/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-nl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-pa/config.xml b/res/values-mcc440-mnc50-pa/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-pa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-pl/config.xml b/res/values-mcc440-mnc50-pl/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-pl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-pt-rPT/config.xml b/res/values-mcc440-mnc50-pt-rPT/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-pt-rPT/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-pt/config.xml b/res/values-mcc440-mnc50-pt/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-pt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ro/config.xml b/res/values-mcc440-mnc50-ro/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ro/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ru/config.xml b/res/values-mcc440-mnc50-ru/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ru/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-si/config.xml b/res/values-mcc440-mnc50-si/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-si/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-sk/config.xml b/res/values-mcc440-mnc50-sk/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-sk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-sl/config.xml b/res/values-mcc440-mnc50-sl/config.xml
deleted file mode 100644
index 4028252..0000000
--- a/res/values-mcc440-mnc50-sl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:vrsta=drugo, klic_v_sili=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-sq/config.xml b/res/values-mcc440-mnc50-sq/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-sq/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-sr/config.xml b/res/values-mcc440-mnc50-sr/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-sr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-sv/config.xml b/res/values-mcc440-mnc50-sv/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-sv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-sw/config.xml b/res/values-mcc440-mnc50-sw/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-sw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ta/config.xml b/res/values-mcc440-mnc50-ta/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ta/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-te/config.xml b/res/values-mcc440-mnc50-te/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-te/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-th/config.xml b/res/values-mcc440-mnc50-th/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-th/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-tl/config.xml b/res/values-mcc440-mnc50-tl/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-tl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-tr/config.xml b/res/values-mcc440-mnc50-tr/config.xml
deleted file mode 100644
index b3b4d02..0000000
--- a/res/values-mcc440-mnc50-tr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:tür=diğer, acil durum=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-uk/config.xml b/res/values-mcc440-mnc50-uk/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-uk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-ur/config.xml b/res/values-mcc440-mnc50-ur/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-ur/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-uz/config.xml b/res/values-mcc440-mnc50-uz/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-uz/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-vi/config.xml b/res/values-mcc440-mnc50-vi/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-vi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-zh-rCN/config.xml b/res/values-mcc440-mnc50-zh-rCN/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-zh-rCN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-zh-rHK/config.xml b/res/values-mcc440-mnc50-zh-rHK/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-zh-rHK/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-zh-rTW/config.xml b/res/values-mcc440-mnc50-zh-rTW/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-zh-rTW/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50-zu/config.xml b/res/values-mcc440-mnc50-zu/config.xml
deleted file mode 100644
index 138e888..0000000
--- a/res/values-mcc440-mnc50-zu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7427277752529391043">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc50/config.xml b/res/values-mcc440-mnc50/config.xml
index df41bab..8b5545e 100644
--- a/res/values-mcc440-mnc50/config.xml
+++ b/res/values-mcc440-mnc50/config.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings">
+    <string-array name="additional_cbs_channels_strings" translatable="false">
         <item>0xA003:type=other, emergency=true</item>
     </string-array>
 </resources>
diff --git a/res/values-mcc440-mnc51-af/config.xml b/res/values-mcc440-mnc51-af/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-af/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-am/config.xml b/res/values-mcc440-mnc51-am/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-am/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ar/config.xml b/res/values-mcc440-mnc51-ar/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ar/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-az/config.xml b/res/values-mcc440-mnc51-az/config.xml
deleted file mode 100644
index 7d735cc..0000000
--- a/res/values-mcc440-mnc51-az/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:növ=digər, fövqəladə=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-bg/config.xml b/res/values-mcc440-mnc51-bg/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-bg/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-bn/config.xml b/res/values-mcc440-mnc51-bn/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-bn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ca/config.xml b/res/values-mcc440-mnc51-ca/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ca/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-cs/config.xml b/res/values-mcc440-mnc51-cs/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-cs/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-da/config.xml b/res/values-mcc440-mnc51-da/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-da/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-de/config.xml b/res/values-mcc440-mnc51-de/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-de/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-el/config.xml b/res/values-mcc440-mnc51-el/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-el/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-en-rAU/config.xml b/res/values-mcc440-mnc51-en-rAU/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-en-rAU/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-en-rGB/config.xml b/res/values-mcc440-mnc51-en-rGB/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-en-rGB/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-en-rIN/config.xml b/res/values-mcc440-mnc51-en-rIN/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-en-rIN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-es-rUS/config.xml b/res/values-mcc440-mnc51-es-rUS/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-es-rUS/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-es/config.xml b/res/values-mcc440-mnc51-es/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-es/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-et/config.xml b/res/values-mcc440-mnc51-et/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-et/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-eu/config.xml b/res/values-mcc440-mnc51-eu/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-eu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-fa/config.xml b/res/values-mcc440-mnc51-fa/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-fa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-fi/config.xml b/res/values-mcc440-mnc51-fi/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-fi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-fr-rCA/config.xml b/res/values-mcc440-mnc51-fr-rCA/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-fr-rCA/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-fr/config.xml b/res/values-mcc440-mnc51-fr/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-fr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-gl/config.xml b/res/values-mcc440-mnc51-gl/config.xml
deleted file mode 100644
index 15b1033..0000000
--- a/res/values-mcc440-mnc51-gl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:tipo=outro, emerxencia=verdadeiro"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-gu/config.xml b/res/values-mcc440-mnc51-gu/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-gu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-hi/config.xml b/res/values-mcc440-mnc51-hi/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-hi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-hr/config.xml b/res/values-mcc440-mnc51-hr/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-hr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-hu/config.xml b/res/values-mcc440-mnc51-hu/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-hu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-hy/config.xml b/res/values-mcc440-mnc51-hy/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-hy/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-in/config.xml b/res/values-mcc440-mnc51-in/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-in/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-is/config.xml b/res/values-mcc440-mnc51-is/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-is/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-it/config.xml b/res/values-mcc440-mnc51-it/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-it/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-iw/config.xml b/res/values-mcc440-mnc51-iw/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-iw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ja/config.xml b/res/values-mcc440-mnc51-ja/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ja/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ka/config.xml b/res/values-mcc440-mnc51-ka/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ka/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-kk/config.xml b/res/values-mcc440-mnc51-kk/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-kk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-km/config.xml b/res/values-mcc440-mnc51-km/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-km/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-kn/config.xml b/res/values-mcc440-mnc51-kn/config.xml
deleted file mode 100644
index 477e1af..0000000
--- a/res/values-mcc440-mnc51-kn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಹೌದು"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ko/config.xml b/res/values-mcc440-mnc51-ko/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ko/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ky/config.xml b/res/values-mcc440-mnc51-ky/config.xml
deleted file mode 100644
index ee0b4d9..0000000
--- a/res/values-mcc440-mnc51-ky/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=башка, өзгөчө кырдаал=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-lo/config.xml b/res/values-mcc440-mnc51-lo/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-lo/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-lt/config.xml b/res/values-mcc440-mnc51-lt/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-lt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-lv/config.xml b/res/values-mcc440-mnc51-lv/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-lv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-mk/config.xml b/res/values-mcc440-mnc51-mk/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-mk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ml/config.xml b/res/values-mcc440-mnc51-ml/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ml/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-mn/config.xml b/res/values-mcc440-mnc51-mn/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-mn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-mr/config.xml b/res/values-mcc440-mnc51-mr/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-mr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ms/config.xml b/res/values-mcc440-mnc51-ms/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ms/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-my/config.xml b/res/values-mcc440-mnc51-my/config.xml
deleted file mode 100644
index 803550e..0000000
--- a/res/values-mcc440-mnc51-my/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှန်"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-nb/config.xml b/res/values-mcc440-mnc51-nb/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-nb/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ne/config.xml b/res/values-mcc440-mnc51-ne/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ne/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-nl/config.xml b/res/values-mcc440-mnc51-nl/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-nl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-pa/config.xml b/res/values-mcc440-mnc51-pa/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-pa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-pl/config.xml b/res/values-mcc440-mnc51-pl/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-pl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-pt-rPT/config.xml b/res/values-mcc440-mnc51-pt-rPT/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-pt-rPT/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-pt/config.xml b/res/values-mcc440-mnc51-pt/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-pt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ro/config.xml b/res/values-mcc440-mnc51-ro/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ro/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ru/config.xml b/res/values-mcc440-mnc51-ru/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ru/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-si/config.xml b/res/values-mcc440-mnc51-si/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-si/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-sk/config.xml b/res/values-mcc440-mnc51-sk/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-sk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-sl/config.xml b/res/values-mcc440-mnc51-sl/config.xml
deleted file mode 100644
index 3554422..0000000
--- a/res/values-mcc440-mnc51-sl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:vrsta=drugo, klic_v_sili=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-sq/config.xml b/res/values-mcc440-mnc51-sq/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-sq/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-sr/config.xml b/res/values-mcc440-mnc51-sr/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-sr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-sv/config.xml b/res/values-mcc440-mnc51-sv/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-sv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-sw/config.xml b/res/values-mcc440-mnc51-sw/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-sw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ta/config.xml b/res/values-mcc440-mnc51-ta/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ta/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-te/config.xml b/res/values-mcc440-mnc51-te/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-te/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-th/config.xml b/res/values-mcc440-mnc51-th/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-th/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-tl/config.xml b/res/values-mcc440-mnc51-tl/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-tl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-tr/config.xml b/res/values-mcc440-mnc51-tr/config.xml
deleted file mode 100644
index 8aabece..0000000
--- a/res/values-mcc440-mnc51-tr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:tür=diğer, acil durum=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-uk/config.xml b/res/values-mcc440-mnc51-uk/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-uk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-ur/config.xml b/res/values-mcc440-mnc51-ur/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-ur/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-uz/config.xml b/res/values-mcc440-mnc51-uz/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-uz/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-vi/config.xml b/res/values-mcc440-mnc51-vi/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-vi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-zh-rCN/config.xml b/res/values-mcc440-mnc51-zh-rCN/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-zh-rCN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-zh-rHK/config.xml b/res/values-mcc440-mnc51-zh-rHK/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-zh-rHK/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-zh-rTW/config.xml b/res/values-mcc440-mnc51-zh-rTW/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-zh-rTW/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51-zu/config.xml b/res/values-mcc440-mnc51-zu/config.xml
deleted file mode 100644
index d7c85b9..0000000
--- a/res/values-mcc440-mnc51-zu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="8821209782876356407">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc51/config.xml b/res/values-mcc440-mnc51/config.xml
index df41bab..8b5545e 100644
--- a/res/values-mcc440-mnc51/config.xml
+++ b/res/values-mcc440-mnc51/config.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings">
+    <string-array name="additional_cbs_channels_strings" translatable="false">
         <item>0xA003:type=other, emergency=true</item>
     </string-array>
 </resources>
diff --git a/res/values-mcc440-mnc52-af/config.xml b/res/values-mcc440-mnc52-af/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-af/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-am/config.xml b/res/values-mcc440-mnc52-am/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-am/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ar/config.xml b/res/values-mcc440-mnc52-ar/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ar/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-az/config.xml b/res/values-mcc440-mnc52-az/config.xml
deleted file mode 100644
index dcae854..0000000
--- a/res/values-mcc440-mnc52-az/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:növ=digər, fövqəladə=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-bg/config.xml b/res/values-mcc440-mnc52-bg/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-bg/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-bn/config.xml b/res/values-mcc440-mnc52-bn/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-bn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ca/config.xml b/res/values-mcc440-mnc52-ca/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ca/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-cs/config.xml b/res/values-mcc440-mnc52-cs/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-cs/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-da/config.xml b/res/values-mcc440-mnc52-da/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-da/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-de/config.xml b/res/values-mcc440-mnc52-de/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-de/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-el/config.xml b/res/values-mcc440-mnc52-el/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-el/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-en-rAU/config.xml b/res/values-mcc440-mnc52-en-rAU/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-en-rAU/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-en-rGB/config.xml b/res/values-mcc440-mnc52-en-rGB/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-en-rGB/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-en-rIN/config.xml b/res/values-mcc440-mnc52-en-rIN/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-en-rIN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-es-rUS/config.xml b/res/values-mcc440-mnc52-es-rUS/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-es-rUS/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-es/config.xml b/res/values-mcc440-mnc52-es/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-es/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-et/config.xml b/res/values-mcc440-mnc52-et/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-et/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-eu/config.xml b/res/values-mcc440-mnc52-eu/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-eu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-fa/config.xml b/res/values-mcc440-mnc52-fa/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-fa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-fi/config.xml b/res/values-mcc440-mnc52-fi/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-fi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-fr-rCA/config.xml b/res/values-mcc440-mnc52-fr-rCA/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-fr-rCA/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-fr/config.xml b/res/values-mcc440-mnc52-fr/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-fr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-gl/config.xml b/res/values-mcc440-mnc52-gl/config.xml
deleted file mode 100644
index c813102..0000000
--- a/res/values-mcc440-mnc52-gl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:tipo=outro, emerxencia=verdadeiro"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-gu/config.xml b/res/values-mcc440-mnc52-gu/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-gu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-hi/config.xml b/res/values-mcc440-mnc52-hi/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-hi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-hr/config.xml b/res/values-mcc440-mnc52-hr/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-hr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-hu/config.xml b/res/values-mcc440-mnc52-hu/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-hu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-hy/config.xml b/res/values-mcc440-mnc52-hy/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-hy/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-in/config.xml b/res/values-mcc440-mnc52-in/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-in/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-is/config.xml b/res/values-mcc440-mnc52-is/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-is/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-it/config.xml b/res/values-mcc440-mnc52-it/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-it/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-iw/config.xml b/res/values-mcc440-mnc52-iw/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-iw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ja/config.xml b/res/values-mcc440-mnc52-ja/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ja/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ka/config.xml b/res/values-mcc440-mnc52-ka/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ka/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-kk/config.xml b/res/values-mcc440-mnc52-kk/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-kk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-km/config.xml b/res/values-mcc440-mnc52-km/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-km/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-kn/config.xml b/res/values-mcc440-mnc52-kn/config.xml
deleted file mode 100644
index b178d22..0000000
--- a/res/values-mcc440-mnc52-kn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಹೌದು"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ko/config.xml b/res/values-mcc440-mnc52-ko/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ko/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ky/config.xml b/res/values-mcc440-mnc52-ky/config.xml
deleted file mode 100644
index 0852995..0000000
--- a/res/values-mcc440-mnc52-ky/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=башка, өзгөчө кырдаал=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-lo/config.xml b/res/values-mcc440-mnc52-lo/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-lo/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-lt/config.xml b/res/values-mcc440-mnc52-lt/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-lt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-lv/config.xml b/res/values-mcc440-mnc52-lv/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-lv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-mk/config.xml b/res/values-mcc440-mnc52-mk/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-mk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ml/config.xml b/res/values-mcc440-mnc52-ml/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ml/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-mn/config.xml b/res/values-mcc440-mnc52-mn/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-mn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-mr/config.xml b/res/values-mcc440-mnc52-mr/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-mr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ms/config.xml b/res/values-mcc440-mnc52-ms/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ms/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-my/config.xml b/res/values-mcc440-mnc52-my/config.xml
deleted file mode 100644
index 5512fc4..0000000
--- a/res/values-mcc440-mnc52-my/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှန်"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-nb/config.xml b/res/values-mcc440-mnc52-nb/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-nb/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ne/config.xml b/res/values-mcc440-mnc52-ne/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ne/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-nl/config.xml b/res/values-mcc440-mnc52-nl/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-nl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-pa/config.xml b/res/values-mcc440-mnc52-pa/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-pa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-pl/config.xml b/res/values-mcc440-mnc52-pl/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-pl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-pt-rPT/config.xml b/res/values-mcc440-mnc52-pt-rPT/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-pt-rPT/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-pt/config.xml b/res/values-mcc440-mnc52-pt/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-pt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ro/config.xml b/res/values-mcc440-mnc52-ro/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ro/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ru/config.xml b/res/values-mcc440-mnc52-ru/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ru/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-si/config.xml b/res/values-mcc440-mnc52-si/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-si/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-sk/config.xml b/res/values-mcc440-mnc52-sk/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-sk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-sl/config.xml b/res/values-mcc440-mnc52-sl/config.xml
deleted file mode 100644
index 8eeb5d4..0000000
--- a/res/values-mcc440-mnc52-sl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:vrsta=drugo, klic_v_sili=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-sq/config.xml b/res/values-mcc440-mnc52-sq/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-sq/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-sr/config.xml b/res/values-mcc440-mnc52-sr/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-sr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-sv/config.xml b/res/values-mcc440-mnc52-sv/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-sv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-sw/config.xml b/res/values-mcc440-mnc52-sw/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-sw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ta/config.xml b/res/values-mcc440-mnc52-ta/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ta/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-te/config.xml b/res/values-mcc440-mnc52-te/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-te/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-th/config.xml b/res/values-mcc440-mnc52-th/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-th/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-tl/config.xml b/res/values-mcc440-mnc52-tl/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-tl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-tr/config.xml b/res/values-mcc440-mnc52-tr/config.xml
deleted file mode 100644
index 5cd3191..0000000
--- a/res/values-mcc440-mnc52-tr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:tür=diğer, acil durum=doğru"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-uk/config.xml b/res/values-mcc440-mnc52-uk/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-uk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-ur/config.xml b/res/values-mcc440-mnc52-ur/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-ur/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-uz/config.xml b/res/values-mcc440-mnc52-uz/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-uz/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-vi/config.xml b/res/values-mcc440-mnc52-vi/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-vi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-zh-rCN/config.xml b/res/values-mcc440-mnc52-zh-rCN/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-zh-rCN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-zh-rHK/config.xml b/res/values-mcc440-mnc52-zh-rHK/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-zh-rHK/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-zh-rTW/config.xml b/res/values-mcc440-mnc52-zh-rTW/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-zh-rTW/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52-zu/config.xml b/res/values-mcc440-mnc52-zu/config.xml
deleted file mode 100644
index ff128e2..0000000
--- a/res/values-mcc440-mnc52-zu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="4428582534010483633">"0xA003:type=other, emergency=true"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc440-mnc52/config.xml b/res/values-mcc440-mnc52/config.xml
index df41bab..8b5545e 100644
--- a/res/values-mcc440-mnc52/config.xml
+++ b/res/values-mcc440-mnc52/config.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings">
+    <string-array name="additional_cbs_channels_strings" translatable="false">
         <item>0xA003:type=other, emergency=true</item>
     </string-array>
 </resources>
diff --git a/res/values-mcc466-af/config.xml b/res/values-mcc466-af/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-af/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-am/config.xml b/res/values-mcc466-am/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-am/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ar/config.xml b/res/values-mcc466-ar/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ar/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-az/config.xml b/res/values-mcc466-az/config.xml
deleted file mode 100644
index 2dea08d..0000000
--- a/res/values-mcc466-az/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:növ=digər, fövqəladə=yanlış"</item>
-    <item msgid="2872497575625059334">"0x0397:növ=digər, fövqəladə=yanlış"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-bg/config.xml b/res/values-mcc466-bg/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-bg/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-bn/config.xml b/res/values-mcc466-bn/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-bn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ca/config.xml b/res/values-mcc466-ca/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ca/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-cs/config.xml b/res/values-mcc466-cs/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-cs/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-da/config.xml b/res/values-mcc466-da/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-da/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-de/config.xml b/res/values-mcc466-de/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-de/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-el/config.xml b/res/values-mcc466-el/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-el/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-en-rAU/config.xml b/res/values-mcc466-en-rAU/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-en-rAU/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-en-rGB/config.xml b/res/values-mcc466-en-rGB/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-en-rGB/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-en-rIN/config.xml b/res/values-mcc466-en-rIN/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-en-rIN/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-es-rUS/config.xml b/res/values-mcc466-es-rUS/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-es-rUS/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-es/config.xml b/res/values-mcc466-es/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-es/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-et/config.xml b/res/values-mcc466-et/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-et/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-eu/config.xml b/res/values-mcc466-eu/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-eu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-fa/config.xml b/res/values-mcc466-fa/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-fa/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-fi/config.xml b/res/values-mcc466-fi/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-fi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-fr-rCA/config.xml b/res/values-mcc466-fr-rCA/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-fr-rCA/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-fr/config.xml b/res/values-mcc466-fr/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-fr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-gl/config.xml b/res/values-mcc466-gl/config.xml
deleted file mode 100644
index 30aad5b..0000000
--- a/res/values-mcc466-gl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:tipo=outro, emerxencia=falso"</item>
-    <item msgid="2872497575625059334">"0x0397:tipo=outro, emerxencia=falso"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-gu/config.xml b/res/values-mcc466-gu/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-gu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-hi/config.xml b/res/values-mcc466-hi/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-hi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-hr/config.xml b/res/values-mcc466-hr/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-hr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-hu/config.xml b/res/values-mcc466-hu/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-hu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-hy/config.xml b/res/values-mcc466-hy/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-hy/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-in/config.xml b/res/values-mcc466-in/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-in/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-is/config.xml b/res/values-mcc466-is/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-is/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-it/config.xml b/res/values-mcc466-it/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-it/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-iw/config.xml b/res/values-mcc466-iw/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-iw/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ja/config.xml b/res/values-mcc466-ja/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ja/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ka/config.xml b/res/values-mcc466-ka/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ka/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-kk/config.xml b/res/values-mcc466-kk/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-kk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-km/config.xml b/res/values-mcc466-km/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-km/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-kn/config.xml b/res/values-mcc466-kn/config.xml
deleted file mode 100644
index a9c088b..0000000
--- a/res/values-mcc466-kn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಇಲ್ಲ"</item>
-    <item msgid="2872497575625059334">"0x0397:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಇಲ್ಲ"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ko/config.xml b/res/values-mcc466-ko/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ko/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ky/config.xml b/res/values-mcc466-ky/config.xml
deleted file mode 100644
index 131586d..0000000
--- a/res/values-mcc466-ky/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=башка, өзгөчө кырдаал=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=башка, өзгөчө кырдаал=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-lo/config.xml b/res/values-mcc466-lo/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-lo/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-lt/config.xml b/res/values-mcc466-lt/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-lt/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-lv/config.xml b/res/values-mcc466-lv/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-lv/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-mk/config.xml b/res/values-mcc466-mk/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-mk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ml/config.xml b/res/values-mcc466-ml/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ml/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-mn/config.xml b/res/values-mcc466-mn/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-mn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-mr/config.xml b/res/values-mcc466-mr/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-mr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ms/config.xml b/res/values-mcc466-ms/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ms/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-my/config.xml b/res/values-mcc466-my/config.xml
deleted file mode 100644
index 8fe7a1b..0000000
--- a/res/values-mcc466-my/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှား"</item>
-    <item msgid="2872497575625059334">"0x0397- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှား"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-nb/config.xml b/res/values-mcc466-nb/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-nb/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ne/config.xml b/res/values-mcc466-ne/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ne/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-nl/config.xml b/res/values-mcc466-nl/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-nl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-pa/config.xml b/res/values-mcc466-pa/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-pa/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-pl/config.xml b/res/values-mcc466-pl/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-pl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-pt-rPT/config.xml b/res/values-mcc466-pt-rPT/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-pt-rPT/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-pt/config.xml b/res/values-mcc466-pt/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-pt/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ro/config.xml b/res/values-mcc466-ro/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ro/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ru/config.xml b/res/values-mcc466-ru/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ru/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-si/config.xml b/res/values-mcc466-si/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-si/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-sk/config.xml b/res/values-mcc466-sk/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-sk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-sl/config.xml b/res/values-mcc466-sl/config.xml
deleted file mode 100644
index 52b650b..0000000
--- a/res/values-mcc466-sl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:vrsta=drugo, klic_v_sili=false"</item>
-    <item msgid="2872497575625059334">"0x0397:vrsta=drugo, klic_v_sili=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-sq/config.xml b/res/values-mcc466-sq/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-sq/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-sr/config.xml b/res/values-mcc466-sr/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-sr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-sv/config.xml b/res/values-mcc466-sv/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-sv/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-sw/config.xml b/res/values-mcc466-sw/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-sw/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ta/config.xml b/res/values-mcc466-ta/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ta/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-te/config.xml b/res/values-mcc466-te/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-te/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-th/config.xml b/res/values-mcc466-th/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-th/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-tl/config.xml b/res/values-mcc466-tl/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-tl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-tr/config.xml b/res/values-mcc466-tr/config.xml
deleted file mode 100644
index 5848efe..0000000
--- a/res/values-mcc466-tr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:tür=diğer, acil durum=yanlış"</item>
-    <item msgid="2872497575625059334">"0x0397:tür=diğer, acil durum=yanlış"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-uk/config.xml b/res/values-mcc466-uk/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-uk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-ur/config.xml b/res/values-mcc466-ur/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-ur/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-uz/config.xml b/res/values-mcc466-uz/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-uz/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-vi/config.xml b/res/values-mcc466-vi/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-vi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-zh-rCN/config.xml b/res/values-mcc466-zh-rCN/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-zh-rCN/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-zh-rHK/config.xml b/res/values-mcc466-zh-rHK/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-zh-rHK/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-zh-rTW/config.xml b/res/values-mcc466-zh-rTW/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-zh-rTW/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466-zu/config.xml b/res/values-mcc466-zu/config.xml
deleted file mode 100644
index 256ae52..0000000
--- a/res/values-mcc466-zu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="3867358472779031537">"0x038F:type=other, emergency=false"</item>
-    <item msgid="2872497575625059334">"0x0397:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc466/config.xml b/res/values-mcc466/config.xml
index bf245c1..f590146 100644
--- a/res/values-mcc466/config.xml
+++ b/res/values-mcc466/config.xml
@@ -19,7 +19,7 @@
     <!-- No need to show this for Taiwanese users -->
     <bool name="show_cmas_settings">false</bool>
 
-    <string-array name="additional_cbs_channels_strings">
+    <string-array name="additional_cbs_channels_strings" translatable="false">
         <!-- Channel 911 and 919 are required by Taiwan NCC -->
         <item>0x038F:type=other, emergency=false</item>
         <item>0x0397:type=other, emergency=false</item>
diff --git a/res/values-mcc724-af/config.xml b/res/values-mcc724-af/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-af/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-am/config.xml b/res/values-mcc724-am/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-am/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ar/config.xml b/res/values-mcc724-ar/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ar/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-az/config.xml b/res/values-mcc724-az/config.xml
deleted file mode 100644
index 03e682b..0000000
--- a/res/values-mcc724-az/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:növ=digər, fövqəladə=yanlış"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-bg/config.xml b/res/values-mcc724-bg/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-bg/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-bn/config.xml b/res/values-mcc724-bn/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-bn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ca/config.xml b/res/values-mcc724-ca/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ca/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-cs/config.xml b/res/values-mcc724-cs/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-cs/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-da/config.xml b/res/values-mcc724-da/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-da/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-de/config.xml b/res/values-mcc724-de/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-de/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-el/config.xml b/res/values-mcc724-el/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-el/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-en-rAU/config.xml b/res/values-mcc724-en-rAU/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-en-rAU/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-en-rGB/config.xml b/res/values-mcc724-en-rGB/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-en-rGB/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-en-rIN/config.xml b/res/values-mcc724-en-rIN/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-en-rIN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-es-rUS/config.xml b/res/values-mcc724-es-rUS/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-es-rUS/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-es/config.xml b/res/values-mcc724-es/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-es/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-et/config.xml b/res/values-mcc724-et/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-et/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-eu/config.xml b/res/values-mcc724-eu/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-eu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-fa/config.xml b/res/values-mcc724-fa/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-fa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-fi/config.xml b/res/values-mcc724-fi/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-fi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-fr-rCA/config.xml b/res/values-mcc724-fr-rCA/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-fr-rCA/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-fr/config.xml b/res/values-mcc724-fr/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-fr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-gl/config.xml b/res/values-mcc724-gl/config.xml
deleted file mode 100644
index f7773a2..0000000
--- a/res/values-mcc724-gl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:tipo=outro, emerxencia=falso"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-gu/config.xml b/res/values-mcc724-gu/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-gu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-hi/config.xml b/res/values-mcc724-hi/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-hi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-hr/config.xml b/res/values-mcc724-hr/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-hr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-hu/config.xml b/res/values-mcc724-hu/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-hu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-hy/config.xml b/res/values-mcc724-hy/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-hy/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-in/config.xml b/res/values-mcc724-in/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-in/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-is/config.xml b/res/values-mcc724-is/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-is/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-it/config.xml b/res/values-mcc724-it/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-it/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-iw/config.xml b/res/values-mcc724-iw/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-iw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ja/config.xml b/res/values-mcc724-ja/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ja/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ka/config.xml b/res/values-mcc724-ka/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ka/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-kk/config.xml b/res/values-mcc724-kk/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-kk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-km/config.xml b/res/values-mcc724-km/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-km/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-kn/config.xml b/res/values-mcc724-kn/config.xml
deleted file mode 100644
index c68081d..0000000
--- a/res/values-mcc724-kn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ಇಲ್ಲ"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ko/config.xml b/res/values-mcc724-ko/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ko/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ky/config.xml b/res/values-mcc724-ky/config.xml
deleted file mode 100644
index 3404d12..0000000
--- a/res/values-mcc724-ky/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=башка, өзгөчө кырдаал=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-lo/config.xml b/res/values-mcc724-lo/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-lo/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-lt/config.xml b/res/values-mcc724-lt/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-lt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-lv/config.xml b/res/values-mcc724-lv/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-lv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-mk/config.xml b/res/values-mcc724-mk/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-mk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ml/config.xml b/res/values-mcc724-ml/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ml/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-mn/config.xml b/res/values-mcc724-mn/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-mn/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-mr/config.xml b/res/values-mcc724-mr/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-mr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ms/config.xml b/res/values-mcc724-ms/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ms/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-my/config.xml b/res/values-mcc724-my/config.xml
deleted file mode 100644
index 8c63b5a..0000000
--- a/res/values-mcc724-my/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှား"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-nb/config.xml b/res/values-mcc724-nb/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-nb/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ne/config.xml b/res/values-mcc724-ne/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ne/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-nl/config.xml b/res/values-mcc724-nl/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-nl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-pa/config.xml b/res/values-mcc724-pa/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-pa/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-pl/config.xml b/res/values-mcc724-pl/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-pl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-pt-rPT/config.xml b/res/values-mcc724-pt-rPT/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-pt-rPT/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-pt/config.xml b/res/values-mcc724-pt/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-pt/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ro/config.xml b/res/values-mcc724-ro/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ro/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ru/config.xml b/res/values-mcc724-ru/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ru/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-si/config.xml b/res/values-mcc724-si/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-si/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-sk/config.xml b/res/values-mcc724-sk/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-sk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-sl/config.xml b/res/values-mcc724-sl/config.xml
deleted file mode 100644
index 97a0313..0000000
--- a/res/values-mcc724-sl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:vrsta=drugo, klic_v_sili=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-sq/config.xml b/res/values-mcc724-sq/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-sq/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-sr/config.xml b/res/values-mcc724-sr/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-sr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-sv/config.xml b/res/values-mcc724-sv/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-sv/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-sw/config.xml b/res/values-mcc724-sw/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-sw/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ta/config.xml b/res/values-mcc724-ta/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ta/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-te/config.xml b/res/values-mcc724-te/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-te/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-th/config.xml b/res/values-mcc724-th/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-th/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-tl/config.xml b/res/values-mcc724-tl/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-tl/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-tr/config.xml b/res/values-mcc724-tr/config.xml
deleted file mode 100644
index 7e2c5a8..0000000
--- a/res/values-mcc724-tr/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:tür=diğer, acil durum=yanlış"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-uk/config.xml b/res/values-mcc724-uk/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-uk/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-ur/config.xml b/res/values-mcc724-ur/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-ur/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-uz/config.xml b/res/values-mcc724-uz/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-uz/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-vi/config.xml b/res/values-mcc724-vi/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-vi/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-zh-rCN/config.xml b/res/values-mcc724-zh-rCN/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-zh-rCN/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-zh-rHK/config.xml b/res/values-mcc724-zh-rHK/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-zh-rHK/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-zh-rTW/config.xml b/res/values-mcc724-zh-rTW/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-zh-rTW/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc724-zu/config.xml b/res/values-mcc724-zu/config.xml
deleted file mode 100644
index 88c6959..0000000
--- a/res/values-mcc724-zu/config.xml
+++ /dev/null
@@ -1,22 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="7811838490237502743">"0x032:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-af/config.xml b/res/values-mcc730-af/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-af/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-am/config.xml b/res/values-mcc730-am/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-am/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ar/config.xml b/res/values-mcc730-ar/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ar/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-az/config.xml b/res/values-mcc730-az/config.xml
deleted file mode 100644
index c7de16b..0000000
--- a/res/values-mcc730-az/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:növ=digər, fövqəladə=yanlış"</item>
-    <item msgid="6577995554917690492">"0x0399:növ=digər, fövqəladə=yanlış"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-bg/config.xml b/res/values-mcc730-bg/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-bg/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-bn/config.xml b/res/values-mcc730-bn/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-bn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ca/config.xml b/res/values-mcc730-ca/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ca/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-cs/config.xml b/res/values-mcc730-cs/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-cs/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-da/config.xml b/res/values-mcc730-da/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-da/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-de/config.xml b/res/values-mcc730-de/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-de/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-el/config.xml b/res/values-mcc730-el/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-el/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-en-rAU/config.xml b/res/values-mcc730-en-rAU/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-en-rAU/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-en-rGB/config.xml b/res/values-mcc730-en-rGB/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-en-rGB/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-en-rIN/config.xml b/res/values-mcc730-en-rIN/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-en-rIN/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-es-rUS/config.xml b/res/values-mcc730-es-rUS/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-es-rUS/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-es/config.xml b/res/values-mcc730-es/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-es/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-et/config.xml b/res/values-mcc730-et/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-et/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-eu/config.xml b/res/values-mcc730-eu/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-eu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-fa/config.xml b/res/values-mcc730-fa/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-fa/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-fi/config.xml b/res/values-mcc730-fi/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-fi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-fr-rCA/config.xml b/res/values-mcc730-fr-rCA/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-fr-rCA/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-fr/config.xml b/res/values-mcc730-fr/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-fr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-gl/config.xml b/res/values-mcc730-gl/config.xml
deleted file mode 100644
index 53f49f3..0000000
--- a/res/values-mcc730-gl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:tipo=outro, emerxencia=falso"</item>
-    <item msgid="6577995554917690492">"0x0399:tipo=outro, emerxencia=falso"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-gu/config.xml b/res/values-mcc730-gu/config.xml
deleted file mode 100644
index af0bbea..0000000
--- a/res/values-mcc730-gu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:પ્રકાર=અન્ય, કટોકટી=ફૉલ્સ"</item>
-    <item msgid="6577995554917690492">"0x0399:પ્રકાર=અન્ય, કટોકટી=ફૉલ્સ"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-hi/config.xml b/res/values-mcc730-hi/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-hi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-hr/config.xml b/res/values-mcc730-hr/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-hr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-hu/config.xml b/res/values-mcc730-hu/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-hu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-hy/config.xml b/res/values-mcc730-hy/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-hy/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-in/config.xml b/res/values-mcc730-in/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-in/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-is/config.xml b/res/values-mcc730-is/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-is/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-it/config.xml b/res/values-mcc730-it/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-it/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-iw/config.xml b/res/values-mcc730-iw/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-iw/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ja/config.xml b/res/values-mcc730-ja/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ja/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ka/config.xml b/res/values-mcc730-ka/config.xml
deleted file mode 100644
index d5b19ce..0000000
--- a/res/values-mcc730-ka/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:ტიპი=სხვა, საგანგებო მდგომარეობა=მცდარია"</item>
-    <item msgid="6577995554917690492">"0x0399:ტიპი=სხვა, საგანგებო მდგომარეობა=მცდარია"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-kk/config.xml b/res/values-mcc730-kk/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-kk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-km/config.xml b/res/values-mcc730-km/config.xml
deleted file mode 100644
index e9f0a40..0000000
--- a/res/values-mcc730-km/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397៖ប្រភេទ=ផ្សេងទៀត, អាសន្ន=មិនពិត"</item>
-    <item msgid="6577995554917690492">"0x0399៖ប្រភេទ=ផ្សេងទៀត, អាសន្ន=មិនពិត"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-kn/config.xml b/res/values-mcc730-kn/config.xml
deleted file mode 100644
index fc30c06..0000000
--- a/res/values-mcc730-kn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ತಪ್ಪು"</item>
-    <item msgid="6577995554917690492">"0x0399:ಪ್ರಕಾರ=ಇತರ, ತುರ್ತು=ತಪ್ಪು"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ko/config.xml b/res/values-mcc730-ko/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ko/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ky/config.xml b/res/values-mcc730-ky/config.xml
deleted file mode 100644
index 22fc6c5..0000000
--- a/res/values-mcc730-ky/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=башка, өзгөчө кырдаал=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=башка, өзгөчө кырдаал=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-lo/config.xml b/res/values-mcc730-lo/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-lo/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-lt/config.xml b/res/values-mcc730-lt/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-lt/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-lv/config.xml b/res/values-mcc730-lv/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-lv/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-mk/config.xml b/res/values-mcc730-mk/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-mk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ml/config.xml b/res/values-mcc730-ml/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ml/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-mn/config.xml b/res/values-mcc730-mn/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-mn/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-mr/config.xml b/res/values-mcc730-mr/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-mr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ms/config.xml b/res/values-mcc730-ms/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ms/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-my/config.xml b/res/values-mcc730-my/config.xml
deleted file mode 100644
index 8ccb41e..0000000
--- a/res/values-mcc730-my/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှား"</item>
-    <item msgid="6577995554917690492">"0x0399- အမျိုးအစား=အခြား၊ အရေးပေါ် =မှား"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-nb/config.xml b/res/values-mcc730-nb/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-nb/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ne/config.xml b/res/values-mcc730-ne/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ne/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-nl/config.xml b/res/values-mcc730-nl/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-nl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-pa/config.xml b/res/values-mcc730-pa/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-pa/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-pl/config.xml b/res/values-mcc730-pl/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-pl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-pt-rPT/config.xml b/res/values-mcc730-pt-rPT/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-pt-rPT/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-pt/config.xml b/res/values-mcc730-pt/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-pt/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ro/config.xml b/res/values-mcc730-ro/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ro/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ru/config.xml b/res/values-mcc730-ru/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ru/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-si/config.xml b/res/values-mcc730-si/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-si/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-sk/config.xml b/res/values-mcc730-sk/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-sk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-sl/config.xml b/res/values-mcc730-sl/config.xml
deleted file mode 100644
index d973006..0000000
--- a/res/values-mcc730-sl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:vrsta=drugo, klic_v_sili=false"</item>
-    <item msgid="6577995554917690492">"0x0399:vrsta=drugo, klic_v_sili=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-sq/config.xml b/res/values-mcc730-sq/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-sq/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-sr/config.xml b/res/values-mcc730-sr/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-sr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-sv/config.xml b/res/values-mcc730-sv/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-sv/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-sw/config.xml b/res/values-mcc730-sw/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-sw/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ta/config.xml b/res/values-mcc730-ta/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ta/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-te/config.xml b/res/values-mcc730-te/config.xml
deleted file mode 100644
index 00d7df7..0000000
--- a/res/values-mcc730-te/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:రకం=ఇతరం, అత్యవసరం=తప్పు"</item>
-    <item msgid="6577995554917690492">"0x0399:రకం=ఇతరం, అత్యవసరం=తప్పు"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-th/config.xml b/res/values-mcc730-th/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-th/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-tl/config.xml b/res/values-mcc730-tl/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-tl/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-tr/config.xml b/res/values-mcc730-tr/config.xml
deleted file mode 100644
index 67a146d..0000000
--- a/res/values-mcc730-tr/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:tür=diğer, acil durum=yanlış"</item>
-    <item msgid="6577995554917690492">"0x0399:tür=diğer, acil durum=yanlış"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-uk/config.xml b/res/values-mcc730-uk/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-uk/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-ur/config.xml b/res/values-mcc730-ur/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-ur/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-uz/config.xml b/res/values-mcc730-uz/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-uz/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-vi/config.xml b/res/values-mcc730-vi/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-vi/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-zh-rCN/config.xml b/res/values-mcc730-zh-rCN/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-zh-rCN/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-zh-rHK/config.xml b/res/values-mcc730-zh-rHK/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-zh-rHK/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-zh-rTW/config.xml b/res/values-mcc730-zh-rTW/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-zh-rTW/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730-zu/config.xml b/res/values-mcc730-zu/config.xml
deleted file mode 100644
index 2c3b4f6..0000000
--- a/res/values-mcc730-zu/config.xml
+++ /dev/null
@@ -1,23 +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 xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="additional_cbs_channels_strings">
-    <item msgid="511913731681534925">"0x0397:type=other, emergency=false"</item>
-    <item msgid="6577995554917690492">"0x0399:type=other, emergency=false"</item>
-  </string-array>
-</resources>
diff --git a/res/values-mcc730/config.xml b/res/values-mcc730/config.xml
index 9dcc004..a052bd3 100644
--- a/res/values-mcc730/config.xml
+++ b/res/values-mcc730/config.xml
@@ -15,7 +15,7 @@
 -->
 
 <resources>
-    <string-array name="additional_cbs_channels_strings">
+    <string-array name="additional_cbs_channels_strings" translatable="false">
         <!-- Channel 919 and 921 are required by Chile -->
         <item>0x0397:type=other, emergency=false</item>
         <item>0x0399:type=other, emergency=false</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 41e9819..4acf435 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Емитувања од мобилен"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Поставки за емитување од мобилен"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Предупредувања за итни случаи"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Поставките за мобилен пренос не се достапни за овој корисник"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Во ред"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Нема активни предупредувања во вашата област. Може да ги измените Поставките за предупредувања користејќи ја опцијата Поставки од менито."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Предупредување за итни случаи (оператор)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Предупредувања за итни случаи"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Пораки за емитување"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Поставки за предупредувања за итни случаи"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Предупредувања"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Пораки за емитување"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Вклучи известувања"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Прикажи емитувања на предупредувања за итни случаи"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Потсетник за предупредување"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Дозволете предупредувања"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Примај известувања за итни случаи"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Звук на потсетникот за предуп."</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Изговори порака за предупредување"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Користи „од текст во говор“ за да изговориш пораки за предупредување за итни случаи"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Поставки за ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Прикажи ETWS-тест емитувања"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Прикажи тест емитувања за Систем за предупредување од земјотрес и цунами (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Прикажи екстремни закани"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Прикажи предупредувања за екстремни закани по животот и имотот"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Прикажи сериозни закани"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Прикажи предупредувања за сериозни закани по животот и имотот"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Прикажи пријави за исчезнати деца во медиумите"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Прикажи објави за грабнувања на деца (аларм „AMBER“)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Прикажи CMAS-тест емитувања"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Прикажи тест емитувања за Комерцијален мобилен систем за предупредување (CMAS)"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Историја на предупредувања"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Поставки за предупредувањата"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Пробни емитувања за ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Пробни емитувања за „Системот за предупредување за земјотрес и цунами“"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Екстремна опасност"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Екстремна опасност по животот и имотот"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Сериозна опасност"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Сериозна опасност по животот и имотот"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Предупредувања AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Билтени за итни случаи на грабнување деца"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Пробни емитувања за CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Пробни емитувања за „Комерцијалниот мобилен систем за предупредување“"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вибрации"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Користете макс. јачина на звук"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Занемари други пост. за јачина на звук и „Не вознемирувај“"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Емитување локални информации за состојбата"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Прикажувај информации за состојбата во статусот на SIM-картичката"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Емитување локални информации за состојбата"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Прикажувај информации за состојбата во статусот на SIM-картичката"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Програмерски опции"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категории на предупредувања:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизички"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 5f3ec84..6ffa646 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"സെൽ ബ്രോഡ്കാസ്‌റ്റുകൾ"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"സെൽ പ്രക്ഷേപണ ക്രമീകരണങ്ങൾ"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"അടിയന്തര അലേർട്ടുകൾ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ഈ ഉപയോക്താവിനായി സെൽ പ്രക്ഷേപണ ക്രമീകരണങ്ങൾ ലഭ്യമല്ല"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ശരി"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"നിങ്ങളുടെ ഏരിയയിൽ സജീവ അലേർട്ടുകളൊന്നുമില്ല. ക്രമീകരണങ്ങളുടെ മെനു ഓപ്‌ഷൻ ഉപയോഗിച്ച് അലേർട്ട് ക്രമീകരണങ്ങൾ നിങ്ങൾക്ക് മാറ്റാനാകും."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"നിങ്ങളുടെ ഏരിയയിൽ സജീവ അലേർട്ടുകളൊന്നുമില്ല. ക്രമീകരണമെനു ഉപയോഗിച്ച് അലേർട്ട് ക്രമീകരണങ്ങളില്‍ മാറ്റം വരുത്താം"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ക്രമീകരണം"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"പ്രക്ഷേപണങ്ങൾ ഇല്ലാതാക്കുക"</string>
     <string name="message_options" msgid="3178489901903589574">"സന്ദേശ ഓപ്‌ഷനുകൾ"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"അടിയന്തര അലേർട്ട് (ഓപ്പറേറ്റർ)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"അടിയന്തര അലേർട്ട്"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"പ്രക്ഷേപണ സന്ദേശങ്ങൾ"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"അടിയന്തര അലേർട്ട് ക്രമീകരണങ്ങൾ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"അലേർട്ടുകൾ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"പ്രക്ഷേപണ സന്ദേശങ്ങൾ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"അറിയിപ്പുകൾ ഓൺ ചെയ്യുക"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"അടിയന്തര അലേർട്ട് പ്രക്ഷേപണങ്ങൾ പ്രദർശിപ്പിക്കുക"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"അലേർട്ട് ഓർമ്മപ്പെടുത്തൽ"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"അലേർട്ടുകൾ അനുവദിക്കുക"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"അടിയന്തര അറിയിപ്പുകൾ സ്വീകരിക്കുക"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"അലേർട്ട് റിമൈൻഡർ ശബ്‌ദം"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"അലേർട്ട് സന്ദേശങ്ങൾ സംസാരിക്കുക"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"അടിയന്തര അലേർട്ട് സന്ദേശങ്ങൾ സംസാരിക്കാൻ ടെക്‌സ്റ്റ്‌-ടു-സ്‌പീച്ച് ഉപയോഗിക്കുക"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS ക്രമീകരണങ്ങൾ"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ കാണിക്കുക"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"ഭൂകമ്പ സുനാമി മുന്നറിയിപ്പ് സി‌സ്റ്റം പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ പ്രദർശിപ്പിക്കുക"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"അത്യന്തഗുരുതര ഭീഷണികൾ കാണിക്കുക"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"ജീവനും സ്വത്തിനും നേരെയുള്ള അത്യന്തം ഗുരുതരമായ ഭീഷണികൾക്കുള്ള അലേർട്ടുകൾ പ്രദർശിപ്പിക്കുക"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ഗുരുതരമായ ഭീഷണികൾ കാണിക്കുക"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"ജീവനും സ്വത്തിനും നേരെയുള്ള ഗുരുതരമായ ഭീഷണികൾക്കുള്ള അലേർട്ടുകൾ പ്രദർശിപ്പിക്കുക"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"ആമ്പർ അലേർട്ടുകൾ കാണിക്കുക"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"കുട്ടികളെ അപഹരിക്കലുമായി ബന്ധപ്പെട്ട് അടിയന്തര ബുള്ളറ്റിനുകൾ പ്രദർശിപ്പിക്കുക (ആമ്പർ അലേർട്ട്)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ കാണിക്കുക"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"വാണിജ്യ മൊബൈൽ അലേർട്ട് സി‌സ്റ്റം പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ പ്രദർശിപ്പിക്കുക"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"അടിയന്തര അലേർട്ട് ചരിത്രം"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"അലേർട്ട് മുൻഗണനകൾ"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"ഭൂകമ്പ സുനാമി മുന്നറിയിപ്പ് സി‌സ്‌റ്റത്തിനായുള്ള പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"അതീവ ഗുരുതരമായ ഭീഷണികൾ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ജീവനും സ്വത്തിനും നേരെയുള്ള അത്യന്തം ഗുരുതരമായ ഭീഷണികൾ"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ഗുരുതരമായ ഭീഷണികൾ"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ജീവനും സ്വത്തിനും നേരെയുള്ള ഗുരുതരമായ ഭീഷണികൾ"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER അലേർട്ടുകൾ"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"കുട്ടികളെ അപഹരിക്കലുമായി ബന്ധപ്പെട്ട അടിയന്തര ബുള്ളറ്റിനുകൾ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"വാണിജ്യ മൊബൈൽ അലേർട്ട് സി‌സ്‌റ്റത്തിനായുള്ള പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"വൈബ്രേറ്റുചെയ്യുക"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"പൂർണ്ണ വോളിയം ഉപയോഗിക്കുക"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"മറ്റുള്ള വോളിയവും \'ശല്യപ്പെടുത്തരുത്\' മുൻഗണനകളും ഒഴിവാക്കുക"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ഏരിയ അപ്‌ഡേറ്റ് ബ്രോഡ്‌കാസ്റ്റുകൾ"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"സിം സ്റ്റാറ്റസിൽ ഏറ്റവും പുതിയ വിവരങ്ങൾ കാണിക്കുക"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ഏരിയ അപ്‌ഡേറ്റ് ബ്രോഡ്‌കാസ്റ്റുകൾ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"സിം സ്റ്റാറ്റസിൽ ഏറ്റവും പുതിയ വിവരങ്ങൾ കാണിക്കുക"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ഡെവലപ്പർ ഓ‌പ്ഷനുകൾ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"അലേർട്ട് വിഭാഗം:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ജിയോഫിസിക്കൽ"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 9b98d79..c9a8040 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Үүрэн Нэвтрүүлэг"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Үүрэн нэвтрүүлгийн тохиргоо"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Яаралтай байдлын сэрэмжлүүлэг"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Энэ хэрэглэгчид Үүрэн нэвтрүүлгийн тохиргоог ашиглах боломжгүй"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Таны байгаа бүсэд идэвхтэй сэрэмжлүүлэг алга байна. Та Сэрэмжлүүлгийн тохиргоог Тохиргоо цэсний сонголтоос өөрчилж болно."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Онцгой байдлын сэрэмжлүүлэг (оператор)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Онцгой байдлын сэрэмжлүүлэг"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Зурвас дамжуулах"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Онцгой байдлын сэрэмжлүүлгийн тохиргоо"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Сануулга"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Зурвас дамжуулах"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Мэдэгдлүүдийг асаах"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Онцгой байдлын сэрэмжлүүлгийн нэвтрүүлгүүдийг харуулах"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Сэрэмжлүүлгийн сануулагч"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Сануулгыг зөвшөөрөх"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Яаралтай үеийн мэдэгдэл авах"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Сануулга сануулагчийн дуу"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Сэрэмжлүүлгийн зурвасыг унших"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Онцгой байдлын сэрэмжлүүлгийн зурвасуудыг уншихын тулд текст-яриаг ашиглана уу"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS тохиргоо"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS тест нэвтрүүлгүүдийг харуулах"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Газар хөдлөлтийн Цунамигийн анхааруулах системийн тест нэвтрүүлгүүдийг харуулах"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Ноцтой аюул заналыг харуулах"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Амь нас болон өмч хөрөнгийн ноцтой аюулын сэрэмжлүүлгийг харуулах"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Ноцтой аюулуудыг харуулах"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Амь нас болон өмч хөрөнгийн ноцтой аюулын сэрэмжлүүлгийг харуулах"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"ХУВАН сэрэмжлүүлгүүдийг харуулах"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Хүүхэд хулгайлсан онцгой байдлын самбарыг харуулах (ХУВАН сэрэмжлүүлэг)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS тест нэвтрүүлгүүдийг харуулах"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Арилжааны Мобайл Сэрэмжлүүлгийн Системийн тест нэвтрүүлгүүдийг харуулах"</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">"ГХЦАС тест дамжуулалт"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Газар Хөдлөлт, Цунамиг Анхааруулах Системийн тест дамжуулалт"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Mаш ноцтой аюул занал"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Амь нас, өмч хөрөнгөд учрах маш ноцтой аюул занал"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ноцтой аюул занал"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Амь нас, өмч хөрөнгөд учрах ноцтой аюул занал"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"УЛБАР ШАР сануулга"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Хүүхэд хулгайлсан тохиолдлын яаралтай мэдээлэл"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"АМСС тест дамжуулалт"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Арилжааны Мобайл Сануулгын Системийн тест дамжуулалт"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Чичиргээ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Хамгийн чангаар тохируулах"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Бусад дууны түвшинг үл хэрэгсэх, Бүү саад бол тохиргоо"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Газрын шинэчлэлтийн дамжуулалт"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Шинэчлэлтийн мэдээллийг SIM-н төлөвт харуулах"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Газрын шинэчлэлтийн дамжуулалт"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Шинэчлэлтийн мэдээллийг SIM-н төлөвт харуулах"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Хөгжүүлэгчийн тохиргоо"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Сэрэмжлүүлгийн Ангилал:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизик"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index c03d767..32f21a0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"सेल प्रसारणे"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"सेल प्रसारण सेटिंग्‍ज"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"आणीबाणीच्या सूचना"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"या वापरकर्त्‍यासाठी सेल प्रसारण सेटिंग्‍ज उपलब्‍ध नाहीत"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ठीक आहे"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"आपल्या क्षेत्रात कोणत्याही सक्रिय सूचना नाहीत. आपण सेटिंग्ज मेनू पर्याय वापरुन सूचना सेटिंग्ज बदलू शकता."</string>
@@ -45,30 +45,31 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"आणीबाणी सूचना (ऑपरेटर)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"आणीबाणी सूचना"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"प्रसारण केलेले संदेश"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"आणीबाणी सूचना सेटिंग्ज"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"सूचना"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण संदेश"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"सूचना चालू करा"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"आणीबाणी सूचना प्रसारणे प्रदर्शित करा"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"सूचना स्मरणपत्र"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"सूचनांची परवानगी द्या"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"आणीबाणी सूचना मिळवा"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"सूचना रिमाइंडरचा आवाज"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"सूचना संदेश बोला"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"आणीबाणी सूचना संदेश बोलण्यासाठी टेक्स्ट-टू-स्पीच वापरा"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS सेटिंग्ज"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS चाचणी प्रसारणे दर्शवा"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"भूकंप त्सुनामी चेतावणी सिस्टमसाठी चाचणी प्रसारणे प्रदर्शित करा"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"अत्याधिक धोके दर्शवा"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"जीवन आणि मालमत्तेस असलेल्या अत्याधिक धोक्यांसाठी सूचना प्रदर्शित करा"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"गंभीर धोके दर्शवा"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"जीवन आणि मालमत्तेस असलेल्या गंभीर धोक्यांसाठी सूचना प्रदर्शित करा"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"अँबर सूचना दर्शवा"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"बाल अपहरण आणीबाणी बुलेटिन (अँबर सूचना) प्रदर्शित करा"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS चाचणी प्रसारणे दर्शवा"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"व्यावसायिक मोबाईल सूचना सिस्टमसाठी चाचणी प्रसारणे प्रदर्शित करा"</string>
-    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंपन होणे"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"आणीबाणी सूचना इतिहास"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"सूचना प्राधान्ये"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS चाचणी प्रसारणे"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"भूकंप त्सुनामी चेतावणी सिस्टमसाठी चाचणी प्रसारणे"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"जबर धोके"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"जीवन आणि मालमत्तेस असलेले जबर धोके"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"गंभीर धोके"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"जीवन आणि मालमत्तेस असलेले गंभीर धोके"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER सूचना"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"बाल अपहरण आणीबाणी बुलेटिन"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS चाचणी प्रसारणे"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"व्यावसायिक मोबाईल सूचना सिस्टमसाठी चाचणी प्रसारणे"</string>
+    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंप पावणे"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"पूर्ण व्‍हॉल्‍यूम वापरा"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"अन्‍य व्‍हॉल्‍यूम आणि व्‍यत्‍यय आणू नका प्राधान्‍यांकडे दुर्लक्ष करा"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"परिसराशी संबंधित अपडेट ब्रॉडकास्ट"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"सिमच्‍या स्थितीत अपडेटची काही माहिती असल्‍यास दाखवा"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"विकासक पर्याय"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"परिसराशी संबंधित अपडेट ब्रॉडकास्ट"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"सिमच्‍या स्थितीत अपडेटची काही माहिती असल्‍यास दाखवा"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"डेव्हलपर पर्याय"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"सूचना श्रेणी:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"भूभौतिक"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"हवामानविषयक"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 4a3df1e..9a28096 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Siaran Sel"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Tetapan Siaran Sel"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Makluman kecemasan"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Tetapan Siaran Sel tidak tersedia untuk pengguna ini"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Tiada amaran aktif di kawasan anda. Anda boleh menukar tetapan Amaran menggunakan pilihan menu Tetapan."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Isyarat kecemasan (pengendali)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Isyarat kecemasan"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mesej siaran"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Tetapan isyarat kecemasan"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Makluman"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesej siaran"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Hidupkan pemberitahuan"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Paparkan siaran isyarat kecemasan"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Peringatan awasan"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Benarkan makluman"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Terima pemberitahuan kecemasan"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Bunyi peringatan makluman"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Tuturkan mesej isyarat"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Gunakan teks kepada pertuturan untuk menuturkan mesej isyarat kecemasan"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Tetapan ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Tunjukkan siaran ujian ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Paparkan siaran ujian bagi Sistem Amaran Tsunami Gempa Bumi"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Tunjukkan ancaman melampau"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Paparkan amaran untuk ancaman melampau kepada kehidupan dan harta benda"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Tunjukkan ancaman teruk"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Paparkan amaran untuk ancaman teruk kepada kehidupan dan harta benda"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Tunjukkan amaran AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Paparkan buletin kecemasan penculikan kanak-kanak (amaran AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Tunjukkan siaran ujian CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Paparkan siaran ujian untuk Sistem Amaran Mudah Alih Perdagangan"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Sejarah makluman kecemasan"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Pilihan makluman"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Siaran ujian ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Siaran ujian bagi Sistem Amaran Tsunami Gempa Bumi"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ancaman melampau"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ancaman melampau kepada nyawa dan harta benda"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ancaman teruk"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ancaman teruk kepada nyawa dan harta benda"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Makluman AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Buletin kecemasan penculikan kanak-kanak"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Siaran ujian CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Siaran ujian untuk Sistem Makluman Mudah Alih Komersial"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Getar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Gunakan kelantangan penuh"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Abaikan pilihan kelantangan yang lain dan Jangan Ganggu"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Siaran kemas kini kawasan"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Tunjukkan maklumat kemas kini dalam status SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Siaran kemas kini kawasan"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Tunjukkan maklumat kemas kini dalam status SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Pilihan pembangun"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategori Awasan:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizikal"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 1a4d3c1..19e2d75 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"ဆဲလ်လူလာ ထုတ်လွှင့်ချက်များ"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"ဆဲလ် ထုတ်လွှင့်မှု ဆက်တင်များ"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"အရေးပေါ်သတိပေးချက်များ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ဆဲလ် ထုတ်လွှင့်မှု ဆက်တင်များကို ဤအသုံးပြုသူ မရယူနိုင်"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"အိုကေ"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"သင်၏ဒေသတွင် လိုက်နာရမည့် သတိပေးချက်များ မရှိပါ။ ဆက်တင်များမီနူးတွင် သတိပေးချက်ဆက်တင်များကို ပြောင်းနိုင်ပါသည်။"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"သင်၏ဒေသတွင် အရေးပေါ် သတိပေးချက်များ မရှိပါ။ ဆက်တင်များမီနူးတွင် သတိပေးချက်ဆက်တင်များကို ပြောင်းနိုင်ပါသည်။"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ဆက်တင်များ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ထုတ်လွှင့်မှုများကို ဖျက်ပါ"</string>
     <string name="message_options" msgid="3178489901903589574">"စာတို ရွေးစရာများ"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"အရေးပေါ် သတိပေးချက် (အော်ပရေတာ)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"အရေးပေါ် သတိပေးချက်များ"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"မက်ဆေ့ဂျ်များ ထုတ်လွှင့်ခြင်း"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"အရေးပေါ် သတိပေးချက် ဆက်တင်များ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"သတိပေးချက်များ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"မက်ဆေ့ဂျ်များ ထုတ်လွှင့်ခြင်း"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"အကြောင်းကြားမှုများ ဖွင့်ပါ"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"အရေးပေါ် သတိပေးရေး ထုတ်လွှင့်ချက်များကို ပြပါ"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"အရေးပေါ်သတိပေးချက်"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"သတိပေးချက်များကို ခွင့်ပြုရန်"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"အရေးပေါ် အကြောင်းကြားချက်များကို လက်ခံရယူရန်"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"သတိပေးချက် အသံ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"စကားပြော သတိပေးချက် သတင်းတို"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"အရေးပေါ် သတိပေးရေး သတင်းများကို ပြောကြားရန် စာသား-မှ-စကားကို အသုံးပြုပါ"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS ဆက်တင်များ"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS စမ်းသပ်ရေး ထုတ်လွှင့်မှု"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"မြေငလျင် ဆူနာမီ သတိပေးရေး စနစ် အတွက် စမ်းသပ်ရေး ထုတ်လွှင့်မှုများကို ပြပါ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"အလွန်စိုးရိမ်စရာ အန္တရာယ်များကို ပြပါ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"အသက်အိုးအိမ်အားခြိမ်းခြောက်သည့် အထူးအန္တရာယ်ကြီးများအတွက် သတိပေးချက်ကို ပြပါ"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ကြီးမားသော အန္တရာယ်များကို ပြပါ"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"အသက်အိုးအိမ်ကို ခြိမ်းခြောက်သည့် ကြီးမားသောအန္တရာယ် သတိပေးချက်များကို ပြပါ"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER သတိပေးချက်များကို ပြပါ"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"ကလေး ခိုးမှု အရေးပေါ် သတင်းစဉ်များကို ပြပေးပါ (AMBER သတိပေးချက်)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS စမ်းသပ်အသံလွှင့်မှုများ ပြပါ"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"မိုဘိုင်းသတိပေးရေးစနစ်ကြော်ငြာအတွက် စမ်းသပ်အသံလွှင့်ချက်များကို ပြပါ"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"အရေးပေါ်သတိပေးချက် မှတ်တမ်း"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"သတိပေးချက် ရွေးချယ်မှုများ"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS စမ်းသပ်ထုတ်လွှင့်ချက်များ"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"မြေငလျင်ဆူနာမီ သတိပေးရေးစနစ်အတွက် စမ်းသပ်ထုတ်လွှင့်ချက်များ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"အလွန်အန္တရာယ်ရှိနေသည်"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"အသက်အိုးအိမ်အတွက် အလွန်အန္တရာယ်ရှိနေသည်"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ကြီးမားသည့် အန္တရာယ်ရှိနေပါသည်"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"အသက်အိုးအိမ်အတွက် ကြီးမားသည့် အန္တရာယ်ရှိနေသည်"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER သတိပေးချက်များ"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ကလေးခိုးမှု အရေးပေါ်ကြေညာချက်"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS စမ်းသပ်ထုတ်လွှင့်ချက်များ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"မိုဘိုင်းသတိပေးရေးစနစ် ကြော်ငြာအတွက် စမ်းသပ်ထုတ်လွှင့်ချက်များ"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"တုန်ခါမှု"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"အသံအကျယ်ကိုသုံးပါ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"အခြား အသံနှင့် မနှောင့်ယှက်ရ ရွေးချယ်မှု ကိုပစ်ထားလိုက်ပါ"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"နယ်မြေအပ်ဒိတ် ထုတ်လွှင့်ခြင်းများ"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"ဆင်းမ်ကဒ်အခြေအနေတွင် အပ်ဒိတ်အချက်အလက်များကို ပြသရန်"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"နယ်မြေအပ်ဒိတ် ထုတ်လွှင့်ခြင်းများ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"ဆင်းမ်ကဒ်အခြေအနေတွင် အပ်ဒိတ်အချက်အလက်များကို ပြသရန်"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ပြုစုပေးခဲ့သူ၏ ရွေးချယ်မှုများ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"သတိပေးချက် အမျိုးအစား:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ဘူမိရုပ်ပိုင်းဆိုင်ရာ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 0373f4a..2cba171 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Kringkastede meldinger"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Innstillinger for cellekringkasting"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Nødvarsler"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Innstillinger for kringkastede meldinger er ikke tilgjengelig for denne brukeren"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Det finnes ingen aktive varsler i området ditt. Du kan endre varselinnstillingene i innstillingsmenyen."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nødvarsel (operatør)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Nødvarsel"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Kringkastingsmeldinger"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Innstillinger for nødvarsling"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Varsler"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Kringkastingsmeldinger"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Slå på varsler"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Vis varsler ved nødssituasjoner"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Påminnelse om varsel"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Tillat varsler"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Motta nødvarsler"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Påminnelseslyd for varsel"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Snakk inn varselmelding"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Bruk tekst-til-tale for å snakke inn meldinger ved nødssituasjoner"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Innstillinger for ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Vis ETWS-testkringkastinger"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Vis testkringkastinger fra varselssystemet for tsunamier og jordskjelv"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Vis ekstreme trusler"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Vis varsler for ekstreme trusler mot liv og eiendom"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Vis alvorlige trusler"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Vis varsler for alvorlige trusler mot liv og eiendom"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Vis varsler ved bortføring av barn"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Vis nødmeldinger ved bortføring av barn"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Vis CMAS-testkringkastinger"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Vis testkringkastinger for Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Nødvarsellogg"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Varselsinnstillinger"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-testkringkastinger"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testkringkastinger fra varselssystemet for tsunamier og jordskjelv"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ekstreme trusler"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ekstreme trusler mot liv og eiendom"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Alvorlige trusler"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Alvorlige trusler mot liv og eiendom"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-varsler"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Nødmeldinger ved bortføring av barn"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-testkringkastinger"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testkringkastinger for Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrer"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Bruk fullt volum"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorer andre innstillinger for volum og Ikke forstyrr"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Kringkastinger av områdeoppdateringer"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Vis oppdateringsinformasjon i SIM-status"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Kringkastinger av områdeoppdateringer"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Vis oppdateringsinformasjon i SIM-status"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Utvikleralternativer"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Varselkategori:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysisk"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index ca85196..4cd4a66 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"सेल प्रसारणहरू"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"सेल प्रसारण सेटिङहरू"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"आपतकालीन अलर्टहरू"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"सेल प्रसारण सेटिङहरू यो प्रयोगकर्ताको लागि उपलब्ध छैनन्"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ठीक छ"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"तपाईंको क्षेत्रमा कुनै पनि सक्रिय अलर्टहरू छैनन्। तपाईं सेटिङहरू मेनु विकल्पको प्रयोग गरी सावधानी सेटिङहरू परिवर्तन गर्न सक्नुहुने छ।"</string>
@@ -32,7 +32,7 @@
     <string name="button_delete" msgid="4672451757925194350">"मेटाउनुहोस्"</string>
     <string name="button_cancel" msgid="7479958360523246140">"रद्द गर्नुहोस्"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"भूकम्प बारे सतर्कता"</string>
-    <string name="etws_tsunami_warning" msgid="6173964105145900312">"सुनामी बारे चेतावनी"</string>
+    <string name="etws_tsunami_warning" msgid="6173964105145900312">"सुनामीको चेतावनी"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"भूकम्प र सुनामी बारे सतर्कता"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"ETWS परीक्षण सन्देश"</string>
     <string name="etws_other_emergency_type" msgid="5233080551309721499">"आपतकालीन चेतावनी"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"आपतकालीन सतर्कता (अपरेटर)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"आपतकालीन सावधानी"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"प्रसारण गर्ने सन्देशहरू"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"आपतकालीन अलर्ट सेटिङहरू"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"अलर्टहरू"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण गर्ने सन्देशहरू"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"सूचनाहरू खुला गर्नुहोस्"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"आपातकालीन चेतावनी प्रसारणहरू प्रदर्शन गर्नुहोस्"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"अलर्ट रिमाइन्डर"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"अलर्टहरूलाई अनुमति दिनुहोस्"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"आपतकालीन सूचनाहरू प्राप्त गर्नुहोस्"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"अलर्टको रिमाइन्डरको ध्वनि"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"चेतावनी सन्देश बोल्नुहोस्"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"आपतकालीन चेतावनी सन्देश बोलाउनको लागि पाठ-देखि-स्पिच प्रयोग गर्नुहोस्"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS सेटिङहरू"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS परीक्षण प्रसारणहरू देखाउनुहोस्"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"भूकम्प सुनामी चेतावनी प्रणालीको लागि परीक्षण प्रसारणहरू प्रदर्शन गर्नुहोस्"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"चरम खतराहरू देखाउनुहोस्"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"जीवन र सम्पत्तीमा चरम खतराहरूको लागि चेतावनीहरू देखाउनुहोस्"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"गम्भीर खतराहरू देखाउनुहोस्"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"जीवन र सम्पत्तीमा गम्भीर खतराहरूको लागि चेतावनीहरू प्रदर्शन गर्नुहोस्"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER चेतावनीहरू देखाउनुहोस्"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"बच्चा अपहरण आपतकालीन बुलेटिनहरू प्रदर्शन गर्नुहोस् (AMBER चेतावनी)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS परीक्षण प्रसारणहरू देखाउनुहोस्"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"वाणिज्य मोबाइल चेतावनी प्रणालीको लागि परीक्षण प्रसारणहरू प्रदर्शन गर्नुहोस्"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"आपतकालीन अलर्टको इतिहास"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"अलर्टका प्राथमिकताहरू"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS का परीक्षण प्रसारणहरू"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"भूकम्प सुनामी चेतावनी प्रणालीका परीक्षण प्रसारणहरू"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"चरम खतराहरू"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"जनधनका लागि चरम खतराहरूको अलर्ट"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"गम्भीर खतराहरू"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"जनधनका लागि गम्भीर खतराहरूको अलर्ट"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER सम्बन्धी अलर्टहरू"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"बच्चाको अपहरण सम्बन्धी आपतकालीन बुलेटिनहरू"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS का परीक्षण प्रसारणहरू"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"व्यापारिक मोबाइल चेतावनी प्रणालीका परीक्षण प्रसारणहरू"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"भाइब्रेट गर्नुहोस्"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"पूर्ण भोल्युम प्रयोग गर्नुहोस्"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"अन्य भोल्युम र बाधा नपुऱ्याउनुहोस्-का प्राथमिकतालाई बेवास्ता गर्नुहोस्"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"क्षेत्रसम्बन्धी अद्यावधिकका प्रसारणहरू"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM को स्थितिमा अद्यावधिकसम्बन्धी जानकारी देखाउनुहोस्‌"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"क्षेत्रसम्बन्धी अद्यावधिकका प्रसारणहरू"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM को स्थितिमा अद्यावधिकसम्बन्धी जानकारी देखाउनुहोस्‌"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"विकासकर्ताका विकल्पहरू"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"चेतावनी कोटी:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"भूभौतिक"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ffe32e7..cf75a96 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Instellingen voor cell broadcasts"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Noodwaarschuwingen"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Instellingen voor cell broadcast zijn niet beschikbaar voor deze gebruiker"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Er zijn geen actieve waarschuwingen in je omgeving. Je kunt de waarschuwingsinstellingen wijzigen via de menuoptie Instellingen."</string>
@@ -45,30 +45,31 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Noodwaarschuwing (provider)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Noodwaarschuwing"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Cell broadcasts"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Instellingen voor noodwaarschuwingen"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Waarschuwingen"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast-berichten"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Meldingen uitschakelen"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Broadcasts met noodwaarschuwingen weergeven"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Herinnering voor meldingen"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Waarschuwingen toestaan"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Noodwaarschuwingen ontvangen"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Geluid waarschuwingsherinnering"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Noodwaarschuwing uitspreken"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Tekst-naar-spraak gebruiken om noodwaarschuwingen uit te spreken"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS-instellingen"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS-testberichten weergeven"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Testbroadcasts van het waarschuwingssysteem voor tsunami\'s en aardbevingen weergeven"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Extreme dreigingen weergeven"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Waarschuwingen voor extreme dreigingen voor levens en eigendommen weergeven"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Ernstige dreigingen weergeven"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Waarschuwingen voor ernstige dreigingen voor levens en eigendommen weergeven"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER-alerts weergeven"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Noodberichten over ontvoering van kinderen weergeven (AMBER-alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS-testberichten weergeven"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Testberichten voor CMAS (Commercial Mobile Alert System) weergeven"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Noodwaarschuwingsgeschiedenis"</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>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extreme dreigingen"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreem gevaar voor levens en eigendommen"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ernstige dreigingen"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ernstig gevaar voor levens en eigendommen"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER Alerts"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Noodberichten over ontvoering van kinderen"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-testberichten"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testberichten voor CMAS (Commercial Mobile Alert System)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Trillen"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Maximumvolume gebruiken"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Andere voorkeuren voor volume en \'Niet storen\' negeren"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Broadcasts met lokale informatie"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Updategegevens weergeven in simkaartstatus"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Opties voor ontwikkelaars"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Broadcasts met lokale informatie"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Updategegevens weergeven in simkaartstatus"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Ontwikkelaarsopties"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Meldingscategorie:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysisch"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorologisch"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 21b880b..409e407 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -17,17 +17,17 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"ਸੈੱਲ ਪ੍ਰਸਾਰਣ"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"ਸੈੱਲ ਪ੍ਰਸਾਰਨ ਸੈਟਿੰਗਾਂ"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ਸੈਲ ਪ੍ਰਸਾਰਨ ਸੈਟਿੰਗਾਂ ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ਸੈੱਲ ਪ੍ਰਸਾਰਨ ਸੈਟਿੰਗਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ਠੀਕ"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"ਤੁਹਾਡੇ ਖੇਤਰ ਵਿੱਚ ਕੋਈ ਸਰਗਰਮ ਚੇਤਾਵਨੀਆਂ ਨਹੀਂ ਹਨ। ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ ਮੀਨੂ ਵਿਕਲਪ ਵਰਤਦੇ ਹੋਏ ਚੇਤਾਵਨੀ ਸੈਟਿੰਗਾਂ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"ਤੁਹਾਡੇ ਖੇਤਰ ਵਿੱਚ ਕੋਈ ਸਰਗਰਮ ਸੁਚੇਤਨਾ ਨਹੀਂ ਹਨ। ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ ਮੀਨੂ ਵਿਕਲਪ ਵਰਤਦੇ ਹੋਏ ਸੁਚੇਤਨਾ ਸੈਟਿੰਗਾਂ ਬਦਲ ਸਕਦੇ ਹੋ।"</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="confirm_delete_broadcast" msgid="2540199303730232322">"ਕੀ ਇਹ ਪ੍ਰਸਾਰਨ ਹਟਾਉਣਾ ਹੈ?"</string>
+    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"ਕੀ ਇਹ ਪ੍ਰਸਾਰਨ ਮਿਟਾਉਣਾ ਹੈ?"</string>
     <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"ਕੀ ਸਾਰੇ ਪ੍ਰਾਪਤ ਕੀਤੇ ਪ੍ਰਸਾਰਨ ਸੁਨੇਹੇ ਮਿਟਾਉਣੇ ਹਨ?"</string>
     <string name="button_delete" msgid="4672451757925194350">"ਮਿਟਾਓ"</string>
     <string name="button_cancel" msgid="7479958360523246140">"ਰੱਦ ਕਰੋ"</string>
@@ -45,30 +45,31 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀ (ਓਪਰੇਟਰ)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀ"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ਪ੍ਰਸਾਰਣ ਸੁਨੇਹੇ"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀ ਸੈਟਿੰਗਾਂ"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ਪ੍ਰਸਾਰਿਤ ਸੁਨੇਹੇ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"ਸੂਚਨਾਵਾਂ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀ ਪ੍ਰਸਾਰਨ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ਚਿਤਾਵਨੀ ਯਾਦ-ਦਹਾਨੀ"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"ਸੁਚੇਤਨਾਵਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"ਸੰਕਟਕਾਲੀਨ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"ਸੁਚੇਤਨਾ ਯਾਦ-ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ਚਿਤਾਵਨੀ ਸੁਨੇਹਾ ਬੋਲੋ"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀ ਸੁਨੇਹੇ ਬੋਲਣ ਲਈ \"ਲਿਖਤ-ਤੋਂ-ਬੋਲੀ\" ਵਰਤੋ"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS ਸੈਟਿੰਗਾਂ"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਦਿਖਾਓ"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"ਭੂਚਾਲ ਸੁਨਾਮੀ ਚਿਤਾਵਨੀ ਸਿਸਟਮ ਲਈ ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"ਪ੍ਰਚੰਡ ਖਤਰੇ ਦਿਖਾਓ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"ਜੀਵਨ ਅਤੇ ਜਾਇਦਾਦ ਲਈ ਪ੍ਰਚੰਡ ਖਤਰਿਆਂ ਦੀਆਂ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ਗੰਭੀਰ ਖਤਰੇ ਦਿਖਾਓ"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"ਜੀਵਨ ਅਤੇ ਜਾਇਦਾਦ ਲਈ ਗੰਭੀਰ ਖਤਰਿਆਂ ਦੀਆਂ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER ਚਿਤਾਵਨੀਆਂ ਦਿਖਾਓ"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"ਬਾਲ ਅਗਵਾ ਐਮਰਜੈਂਸੀ ਬੁਲੇਟਿਨ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ (AMBER ਚਿਤਾਵਨੀ)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਦਿਖਾਓ"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"ਵਪਾਰਕ ਮੋਬਾਈਲ ਚਿਤਾਵਨੀ ਪ੍ਰਣਾਲੀ ਲਈ ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀ ਸੁਨੇਹੇ ਬੋਲਣ ਲਈ \"ਲਿਖਤ ਤੋਂ ਬੋਲੀ\" ਵਰਤੋ"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਦਾ ਇਤਿਹਾਸ"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"ਸੁਚੇਤਨਾ ਤਰਜੀਹਾਂ"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS ਟੈਸਟ ਪ੍ਰਸਾਰਣ"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"ਭੂਚਾਲ ਸੁਨਾਮੀ  ਚਿਤਾਵਨੀ  ਸਿਸਟਮ ਲਈ ਟੈਸਟ ਪ੍ਰਸਾਰਣ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"ਹੱਦੋਂ ਵੱਧ ਖਤਰੇ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ਜੀਵਨ ਅਤੇ ਜ਼ਮੀਨ-ਜਾਇਦਾਦ ਨੂੰ ਹੱਦੋਂ ਵੱਧ ਖਤਰਿਆਂ ਸਬੰਧੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ਗੰਭੀਰ ਖਤਰੇ"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ਜੀਵਨ ਅਤੇ ਜ਼ਮੀਨ-ਜਾਇਦਾਦ ਨੂੰ ਗੰਭੀਰ ਖਤਰਿਆਂ ਸਬੰਧੀ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"ਐਂਬਰ ਸੁਚੇਤਨਾਵਾਂ"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ਅਗਵਾ ਹੋਏ ਬੱਚੇ ਸਬੰਧੀ ਸੰਕਟਕਾਲੀਨ ਬੁਲੇਟਿਨ"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS ਟੈਸਟ ਪ੍ਰਸਾਰਣ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"ਵਪਾਰਕ ਮੋਬਾਈਲ ਸੁਚੇਤਨਾ ਸਿਸਟਮ ਲਈ ਟੈਸਟ ਪ੍ਰਸਾਰਣ"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ਪੂਰੀ ਵੌਲਿਊਮ ਦੀ ਵਰਤੋਂਂ ਕਰੋ"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"ਹੋਰ ਵੌਲਿਊਮ ਅਤੇ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤਰਜੀਹਾਂ ਨੂੰ ਅਣਡਿੱਠ ਕਰੋ"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ਖੇਤਰ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਦੇ ਪ੍ਰਸਾਰਣ"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM ਅਵਸਥਾ ਵਿੱਚ ਅੱਪਡੇਟ ਦੀ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"ਵਿਕਾਸਕਾਰ ਚੋਣਾਂ"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"ਹੋਰ ਅਵਾਜ਼ ਅਤੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤਰਜੀਹਾਂ ਨੂੰ ਅਣਡਿੱਠ ਕਰੋ"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ਖੇਤਰ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਦੇ ਪ੍ਰਸਾਰਣ"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"ਸਿਮ ਸਥਿਤੀ ਵਿੱਚ ਅੱਪਡੇਟ ਦੀ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"ਵਿਕਾਸਕਾਰ ਵਿਕਲਪ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ਚਿਤਾਵਨੀ ਸ਼੍ਰੇਣੀ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ਜਿਓਫਿਜੀਕਲ"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"ਮੌਸਮ ਵਿਗਿਆਨ ਸੰਬੰਧੀ"</string>
@@ -103,12 +104,12 @@
     <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="4370292554938680862">"ਪਹਿਲੀ CMAS ਚਿਤਾਵਨੀ ਡਿਸਪਲੇ ਕਰਨ ਤੋਂ ਬਾਅਦ ਇੱਕ ਔਪਟ-ਆਊਟ ਡਾਇਲੌਗ ਦਿਖਾਓ (ਪ੍ਰੈਜੀਡੈਂਸ਼ੀਅਲ ਚਿਤਾਵਨੀ ਤੋਂ ਇਲਾਵਾ)।"</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"ਪਹਿਲੀ CMAS ਚਿਤਾਵਨੀ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਤੋਂ ਬਾਅਦ ਇੱਕ ਔਪਟ-ਆਊਟ ਡਾਇਲੌਗ ਦਿਖਾਓ (ਪ੍ਰੈਜੀਡੈਂਸ਼ੀਅਲ ਚਿਤਾਵਨੀ ਤੋਂ ਇਲਾਵਾ)।"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"ਔਪਟ-ਆਊਟ ਡਾਇਲੌਗ ਦਿਖਾਓ"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"ਇਸ ਵੇਲੇ ਤੁਸੀਂ ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰਨਾ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"ਇਸ ਵੇਲੇ ਤੁਸੀਂ ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰਨਾ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"ਹਾਂ"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"ਨਹੀਂ"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"ਸੰਕਟਕਾਲੀਨ ਚੇਤਾਵਨੀ ਸਬੰਧੀ ਇਤਿਹਾਸ"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾ ਦਾ ਇਤਿਹਾਸ"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ਇੱਕ ਵਾਰ"</item>
     <item msgid="9097229303902157183">"ਹਰੇਕ 2 ਮਿੰਟਾਂ ਵਿੱਚ"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 375842c..34c7fd4 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Transmisje komórkowe"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Komunikaty z sieci komórkowej"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alerty o zagrożeniu"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Ustawienia komunikatów z sieci komórkowej nie są dostępne dla tego użytkownika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nie ma aktywnych alertów w Twojej okolicy. Alerty możesz zmodyfikować w menu Ustawienia."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nie ma aktywnych alertów w Twojej okolicy. Opcje alertów możesz zmodyfikować w menu Ustawienia."</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>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alert o zagrożeniu (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alert o zagrożeniu"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Komunikaty"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Ustawienia alertów o zagrożeniu"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerty"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Komunikaty"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Włącz powiadomienia"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Wyświetlaj alerty o zagrożeniu"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alarm z przypomnieniem"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Zezwól na alerty"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Otrzymuj powiadomienia o zagrożeniu"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Dźwięk przypomnienia o alercie"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Czytaj treść alertu"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Użyj funkcji przetwarzania tekstu na mowę do odczytywania wiadomości z alertami o zagrożeniu"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Ustawienia systemu ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Pokazuj transmisje testowe ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Wyświetlaj transmisje testowe w systemie ostrzegania przed trzęsieniami ziemi i tsunami (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Pokazuj ekstremalne zagrożenia"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Wyświetlaj alerty o ekstremalnych zagrożeniach życia i mienia"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Pokazuj poważne zagrożenia"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Wyświetlaj alerty o poważnych zagrożeniach życia i mienia"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Pokazuj alerty AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Wyświetlaj komunikaty o uprowadzeniu dziecka (alerty AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Pokazuj transmisje testowe CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Wyświetlaj transmisje testowe w systemie CMAS (Commercial Mobile Alert System)"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Transmisje testowe ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Transmisje testowe w systemie ostrzegania przed trzęsieniami ziemi i tsunami (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Krytyczne zagrożenia"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Krytyczne zagrożenia życia i mienia"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Poważne zagrożenia"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Poważne zagrożenia życia i mienia"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alerty AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Komunikaty o uprowadzeniu dziecka"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Transmisje testowe CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Transmisje testowe w systemie CMAS (Commercial Mobile Alert System)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Wibracje"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Użyj maksymalnej głośności"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignoruj inne ustawienia głośności i trybu Nie przeszkadzać"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Aktualne informacje z danego obszaru"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Pokaż aktualne informacje w ramach stanu karty SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Aktualne informacje z danego obszaru"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Pokaż aktualne informacje w ramach stanu karty SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcje programistyczne"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategoria alertu:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Zagrożenie geofizyczne"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5c79937..b660f47 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Difusões celulares"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Definições de transmissão celular"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alertas de emergência"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"As definições de difusão celular não estão disponíveis para este utilizador"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Não existem alertas ativos na sua área. Pode alterar as definições de alertas utilizando a opção do menu Definições."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emergência (Operador)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerta de Emergência"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mensagens de difusão"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Definições de Alerta de Emergência"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mensagens de difusão"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Ativar notificações"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Apresentar transmissões de alertas de emergência"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Lembrete de alerta"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Permitir alertas"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Receber notificações de emergência"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Som dos lembretes de alerta"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Dizer mensagem de alerta"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Utilize a síntese de voz para dizer mensagens de alerta de emergência"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Definições ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Mostrar dif. de teste do ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Mostrar transmissões de teste para o Sistema de Aviso de Terramotos e Tsunamis"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Mostrar ameaças extremas"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Apresentar alertas para ameaças extremas à vida e propriedade"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Mostrar ameaças graves"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Apresentar alertas para ameaças graves à vida e propriedade"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Mostrar Alertas AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Apresentar boletins de emergência de raptos de crianças (alerta AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Mostrar dif. de teste do CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Mostrar difusões de teste para o Sistema Comercial de Alerta de Telemóveis"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Difusões de teste do ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Difusões de teste para o Sistema de Aviso de Terramotos e Tsunamis"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ameaças extremas"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ameaças extremas à vida e à propriedade"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ameaças graves"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ameaças graves à vida e à propriedade"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas ÂMBAR"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Boletins de emergência de raptos de crianças"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Difusões de teste do CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Difusões de teste para o Sistema Comercial de Alerta de Telemóveis"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Utilizar volume máximo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar preferências de Não incomodar e de volume"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Transmissões de atualização de área"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostrar informações de atualização no estado do SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Transmissões de atualização de área"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostrar informações de atualização no estado do SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opções de programador"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria de Alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísico"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1ea3cf2..a79eaba 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Transmissões por celular"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Configurar transmissão por celular"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alertas de emergência"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"As configurações de transmissão celular 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="5409324337492758562">"Não há alertas ativos em sua área. É possível alterar as configurações de alerta utilizando a opção do menu \"Configurações\"."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerta de emergência (telefonista)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alerta de emergência"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Transmitir mensagens"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Configurações do alerta de emergência"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alertas"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Transmitir mensagens"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Ativar as notificações"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Mostrar transmissões de alerta de emergência"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Lembrete de alerta"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Permitir alertas"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Receber notificações de emergência"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Som do lembrete de alerta"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Falar mensagem de alerta"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Usar conversão de texto em fala para falar mensagens de alerta de emergência"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Configurações do ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Mostrar transm. de teste ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Mostrar transmissões de teste do Sistema de Aviso de Tsunamis e Terremotos"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Mostrar ameaças extremas"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Exibir alertas para ameaças extremas: materiais ou à vida"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Mostrar ameaças graves"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Exibir alertas para ameaças extremas: materiais ou à vida"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Mostrar Alertas AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Mostrar boletins de emergência de sequestro de crianças (alerta AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Mostrar transm. de teste CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Exibir transmissões de teste para o Sistema de alertas para celular comercial"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Transmissões de teste do ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Transmissões de teste do Sistema de aviso de tsunamis e terremotos"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ameaças extremas"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ameaças extremas, materiais ou à vida"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ameaças graves"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ameaças graves, materiais ou à vida"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Boletins de emergência de rapto de crianças"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Transmissões de teste do CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Transmissões de teste para o Sistema de alertas para celular comercial"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrar"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Usar volume máximo"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorar outras preferências de \"Não perturbe\" e volume"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Transmissões de atualização de área"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Mostrar informações de atualização no status do SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Transmissões de atualização de área"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Mostrar informações de atualização no status do SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opções do desenvolvedor"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria de alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísico"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 0dfc50f..6b8c674 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Transmisii celulare"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Setări pentru transmisia celulară"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Alerte de urgență"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Setările pentru transmisia celulară nu sunt disponibile pentru acest utilizator"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nu există alerte active din zona dvs. Puteți să modificați setările pentru Alerte utilizând opțiunea Setări din meniu."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alertă de urgență (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alertă de urgență"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mesaje difuzate"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Setări pentru alerte de urgență"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerte"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesaje privind difuzarea"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activați notificările"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Afișați difuzările cu alerte de urgență"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Memento alerte"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Permiteți alertele"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Primiți notificări despre urgențe"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Sunet de memento pentru alertă"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Mesajele de alertă se rostesc"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Utilizați funcția de transformare a textului în vorbire pt. a comunica mesajele alertelor de urgență"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Setări ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Afișați alerte de test ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Afișați difuzările de testare pentru sistemul de avertizare în caz de cutremur și tsunami"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Afișați amenințările extreme"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Afișați alertele pentru amenințările extreme în ceea ce privește viața și bunurile"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Afișați amenințările grave"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Afișați alertele pentru amenințările grave în ceea ce privește viața și bunurile"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Afișați alertele AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Afișați buletinele privind urgențele în cazuri de răpire de copii (alertă AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Afișați alerte de test CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Afișați alerte de test pentru Commercial Mobile Alert System"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Difuzări de testare ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Difuzări de testare pentru sistemul de avertizare în caz de cutremur și tsunami"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Pericole extreme"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Pericole extreme privind viața și bunurile"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Pericole grave"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Pericole grave privind viața și bunurile"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alerte AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Informări de urgență despre copii răpiți"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Difuzări de testare CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Difuzări de testare pentru Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrare"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Selectați volum maxim"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorați alte preferințe privind volumul și modul Nu deranja"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Difuzarea actualizărilor despre zonă"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Afișați informațiile despre actualizare în starea cardului SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Difuzarea actualizărilor despre zonă"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Afișați informațiile despre actualizare în starea cardului SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opțiuni pentru dezvoltatori"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria alertei:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizic"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 2880221..b21b9be 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Оповещение населения"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Настройки"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Оповещение населения"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Настройки оповещения населения недоступны этому пользователю"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ОК"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"В вашем регионе нет активных оповещений. Изменить параметры оповещений можно в меню \"Настройки\"."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Экстренное оповещение (оператор)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Экстренное оповещение"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Сообщения оповещения"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Типы экстренных оповещений"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Оповещения"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Сообщения о трансляции"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Включить уведомления"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Показывать оповещения о чрезвычайных ситуациях"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Периодичность напоминаний"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Разрешить оповещения"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Получать уведомления о чрезвычайных ситуациях"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Звук напоминания"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Произносить оповещения"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Использовать функцию преобразования текста в речь для чтения экстренных оповещений"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Предупреждения о землетрясениях и цунами"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Тестовые рассылки ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Показывать тестовые рассылки для системы предупреждения о землетрясениях и цунами"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Критические угрозы"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Сообщать о критических угрозах жизни и имуществу"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Серьезные угрозы"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Сообщать о серьезных угрозах жизни и имуществу"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Оповещения AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Показывать сообщения о пропавших детях"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Тестовые рассылки CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Показывать тестовые рассылки системы CMAS"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Архив экстренных оповещений"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Настройки оповещений"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Тестовые рассылки ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Тестовые рассылки для системы предупреждения о землетрясениях и цунами"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Критические угрозы"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Критические угрозы жизни и имуществу"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Серьезные угрозы"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Серьезные угрозы жизни и имуществу"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Оповещения AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Сообщения о пропавших детях"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Тестовые рассылки CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Тестовые рассылки системы CMAS"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вибросигнал"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Включить полную громкость"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Игнорировать другие настройки звука и режима \"Не беспокоить\""</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Аварийные оповещения"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Показывать информацию об обновлении в статусе SIM-карты"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Аварийные оповещения"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Показывать информацию об обновлении в статусе SIM-карты"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Для разработчиков"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категория оповещения:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Землетрясение"</string>
@@ -114,6 +115,6 @@
     <item msgid="9097229303902157183">"Каждые 2 минуты"</item>
     <item msgid="5718214950343391480">"Каждые 5 минут"</item>
     <item msgid="3863339891188103437">"Каждые 15 минут"</item>
-    <item msgid="6868848414437854609">"Отключить"</item>
+    <item msgid="6868848414437854609">"Отключен"</item>
   </string-array>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 10edad4..4b78cc7 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"සෙල් විකාශකයින්"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"ජංගම විකාශන සැකසීම්"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"හදිසි ඇඟවීම්"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"මෙම පරිශීලකයා සඳහා සෙල් ප්‍රචාර සැකසීම් නැත"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"හරි"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"ඔබගේ ප්‍රදේශයේ සක්‍රිය ඇඟවීම් නොමැත. සැකසීම් මෙනු විකල්පය භාවිතයෙන් ඇඟවීම සැකසීම් ඔබට වෙනස් කළ හැක."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"හදිසි ඇඟවීම (ක්‍රියාකරු)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"හදිසි ඇඟවීම"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"විකාශ පණිවිඩ"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"හදිසි ඇඟවීම් සැකසීම්"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"ඇඟවීම්"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"විකාශ පණිවිඩ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"දැනුම්දීම් සක්‍රිය කරන්න"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"හදිසි ඇඟවීම් විකාශනය පෙන්වන්න"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"ඇඟවීම් මතක් කිරීම"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"ඇඟවීම්වලට ඉඩ දෙන්න"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"හදිසි අවස්ථා දැනුම්දීම් ලබා ගන්න"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"ඇඟවීම් සිහිකැඳවීම් හඬ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ඇඟවීම් පණිවිඩ කතා කරවන්න"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"හදිසි ඇඟවීම් පණිවිඩ කියවීමට වැකි-සිට-කථන භාවිතා කරන්න"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS සැකසීම්"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS පරීක්ෂණ විකාශන පෙන්වන්න"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"භූකම්පන සුනාමි අනතුරු ඇඟවීම් පද්ධති සඳහා පරීක්ෂණ විකාශන පෙන්වන්න"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"උපරිම තර්ජන පෙන්වන්න"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"ජීවිත සහ දේපල වෙත ඇති උපරිම තර්ජන සඳහා ඇඟවීම් පෙන්වන්න"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"දැඩි තර්ජන පෙන්වන්න"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"ජීවිතය සහ දේපල වෙත ඇති දැඩි තර්ජන සඳහා නිවේදන පෙන්වන්න"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER ඇඟවීම් පෙන්වන්න"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"ළමා අපචාර හදිසි ඇඟවීම පෙන්වන්න (AMBER නිවේදන)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS පරීක්ෂණ විකාශන පෙන්වන්න"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"වාණිජ ජංගම ඇඟවීමේ පද්ධති සඳහා පරීක්ෂණ විකාශන පෙන්වන්න"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"හදිසි අවස්ථා ඇඟවීම් ඉතිහාසය"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"ඇඟවීම් මනාප"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS පරීක්ෂණ විකාශ"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"භූකම්පන සුනාමි අනතුරු ඇඟවීම් පද්ධතිය සඳහා පරීක්ෂණ විකාශ"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"උපරිම තර්ජන"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ජීවිත සහ දේපළවලට උපරිම තර්ජන"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"දැඩි තර්ජන"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ජීවිත සහ දේපළවලට දැඩි තර්ජන"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER ඇඟවීම්"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ළමා අපහරණ හදිසි අවස්ථා බුලටින"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS පරීක්ෂණ විකාශ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"වාණිජ ජංගම ඇඟවීමේ පද්ධතිය සඳහා පරීක්ෂණ විකාශ"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"කම්පනය"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"පූර්ණ හඬ පරිමාව භාවිත කරන්න"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"වෙනත් හඬ පරිමාව සහ බාධා නොකරන්න මනාප නොසලකා හරින්න"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ප්‍රදේශ යාවත්කාලීන තොරතුරු"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM තත්ත්වය තුළ යාවත්කාලීන තොරතුරු පෙන්වන්න"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ප්‍රදේශ යාවත්කාලීන විකාශන"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM තත්ත්වය තුළ යාවත්කාලීන තොරතුරු පෙන්වන්න"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"සංවර්ධක විකල්ප"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ඇඟවීමේ ප්‍රවර්ගය:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"භූ භෞතික"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index fb2b923..0578b20 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Správy informačných služieb"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Správy informačných služieb"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Tiesňové upozornenia"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Tento používateľ nemá k dispozícii nastavenia správ informačných služieb"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Vo vašej oblasti nie sú žiadne aktívne upozornenia. Nastavenia upozornení môžete meniť v Nastaveniach."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Tiesňové upozornenie (operátor)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Tiesňové upozornenie"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Správy vysielania"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Nastavenia tiesňových upozornení"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozornenia"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Správy vysielania"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Zapnúť upozornenia"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Zobrazovať tiesňové upozornenia"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Pripomínať upozornenia"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Povoliť upozornenia"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Prijímať tiesňové upozornenia"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Zvuk pripomenutí upozornení"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Čítať upozornenia"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Čítať tiesňové upozornenia prevodom textu na reč"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Nastavenia systému ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Zobrazovať testovacie upozornenia ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Zobrazovať testovacie upozornenia Systému varovania pred zemetrasením a cunami (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Zobrazovať extrémne hrozby"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Zobrazovať upozornenia na extrémne ohrozenie života a majetku"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Zobrazovať závažné hrozby"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Zobrazovať upozornenia na závažné ohrozenie života a majetku"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Zobrazovať upozornenia Amber"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Zobrazovať upozornenia na únosy detí"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Zobraziť test vysielania CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Zobrazovať testovacie vysielania systému Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"História tiesňových upozornení"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Predvoľby upozornení"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Testovacie vysielania ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testovacie vysielania systému varovania pred zemetrasením a cunami"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extrémne hrozby"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extrémne ohrozenie života a majetku"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Závažné hrozby"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Závažné ohrozenie života a majetku"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Upozornenia AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Tiesňové správy o únosoch detí"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Testovacie vysielania CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testovacie vysielania systému Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrovať"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Použiť plnú hlasitosť"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Predvoľby Ignorovať ďalšie nastavenia hlasitosti a Nerušiť"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Vysielania s aktuálnymi informáciami oblasti"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Zobrazovať informácie o aktualizácii v stave SIM karty"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Vysielania s aktuálnymi informáciami oblasti"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Zobrazovať informácie o aktualizácii v stave SIM karty"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Pre vývojárov"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategória upozornenia:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofyzikálne"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index cd52060..5afc944 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Oddaje v celici"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Nastavitve oddaje v celici"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Nujna opozorila"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Nastavitve sporočil o trenutni lokaciji niso na voljo za tega uporabnika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"V redu"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Na vašem območju ni aktivnih opozoril. Nastavitve opozoril lahko spremenite v meniju z nastavitvami."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Opozorilo v sili (operater)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Opozorilo v sili"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sporočila mobilnega operaterja"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Nastavitve opozoril v sili"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Opozorila"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sporočila mobilnega operaterja"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Vklop besedil"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Prikaži oddaje za opozorila v sili"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Opomnik za opozorilo"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Dovoli opozorila"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Prejemanje obvestil v sili"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Zvok opomnika za opozorilo"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Izgovorite opozorilno sporočilo"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Za izgovorjavo opozoril v sili uporabi pretvorbo besedila v govor"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Nastavitve ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Pokaži preskus. oddaje za ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Prikaži preskusne oddaje za opozorilni sistem o potresih in cunamijih"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Pokaži izjemne nevarnosti"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Prikaz opozoril o izjemnih nevarnostih za življenje in premoženje"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Pokaži hude nevarnosti"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Prikaz opozoril o hudih nevarnostih za življenje in premoženje"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Pokaži opozorila AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Prikaz nujnih obvestil o ugrabitvah otrok (opozorila AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Pokaži preskus. oddaje za CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Prikaz preskusnih oddaj za komercialni mobilni sistem opozarjanja na nevarnost"</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_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_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_test_alerts_title" msgid="9000272842269750162">"Preskusne oddaje CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Preskusne oddaje komercialnega mobilnega sistema za opozarjanje na nevarnost"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibriranje"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Uporabi največjo glasnost"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Prezri druge nastavitve glasnosti in načina »ne moti«"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Oddaje z najnovejšimi območnimi informacijami"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Prikaz najnovejših informacij pri stanju kartice SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Oddaje z najnovejšimi območnimi informacijami"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Prikaz najnovejših informacij pri stanju kartice SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Možnosti za razvijalce"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorija opozorila:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizična"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 75476e6..d0d133f 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Transmetimi celular"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Cilësimet e transmetimit celular"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Sinjalizimet e urgjencës"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Cilësimet e transmetimit celular nuk janë të disponueshme për këtë përdorues"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Në rregull"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nuk ka alarme aktive në zonën tënde. Mund t\'i ndryshosh cilësimet e alarmeve duke përdorur opsionin e menysë \"Cilësimet\"."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alarmi i urgjencës (operatori)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alarm urgjence"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mesazhet e transmetimit"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Cilësimet e alarmit të urgjencës"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Sinjalizimet"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mesazhet e transmetimit"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Aktivizo njoftimet"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Shfaq transmetimet e alarmeve të urgjencës"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alarmet rikujtuese"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Lejo sinjalizimet"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Merr njoftimet e urgjencës"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Tingulli i alarmeve rikujtuese"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Dëgjo mesazhin e alarmit"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Përdor konvertimin e tekstit në të folur, për të dëgjuar mesazhet e alarmit të urgjencës"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Cilësimet e ETWS-së"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Shfaq transmetimet provë të ETWS-së"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Shfaq transmetimet provë për \"Sistemin e paralajmërimeve për cunami dhe tërmete\""</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Shfaq kërcënimet ekstreme"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Shfaq alarmet për kërcënime ekstreme mbi jetën dhe pronën"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Shfaq kërcënimet serioze"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Shfaq alarmet për kërcënimet serioze mbi jetën dhe pronën"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Shfaq alarmet \"Amber\""</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Shfaq buletinet e urgjencës për rrëmbim fëmijësh (alarmi \"Amber\")"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Shfaq transmetimet provë të CMAS-së"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Shfaq transmetimet provë për \"Sistemin e alarmeve celulare tregtare\""</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Transmetimet provë të ETWS-së"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Transmetime provë për \"Sistemin e paralajmërimeve për cunami dhe tërmete\""</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Kërcënimet ekstreme"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Kërcënime ekstreme për jetën dhe pronën"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Kërcënimet serioze"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Kërcënime serioze për jetën dhe pronën"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Sinjalizimet AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Buletinet e urgjencës për rrëmbim fëmijësh"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Transmetimet provë të CMAS-së"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Transmetime provë për \"Sistemin e sinjalizimeve celulare tregtare\""</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Dridhje"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Përdor volumin e plotë"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Shpërfill volumin tjetër dhe preferencat e \"Mos shqetëso\""</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Transmetimet e përditësimeve për zonën"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Shfaq informacionet e përditësimit në statusin e kartës SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Transmetimet e përditësimeve për zonën"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Shfaq informacionet e përditësimit në statusin e kartës SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opsionet e zhvilluesit"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategoria e alarmit:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Gjeofizik"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9574a4d..826676e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Емитовања оператера"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Подешавања емитовања оператера"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Хитна обавештења"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Подешавања за поруке за мобилне уређаје на локалитету нису доступна за овог корисника"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Потврди"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Нема активних упозорења у вашој области. Подешавања упозорења можете да промените помоћу опције менија Подешавања."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Обавештење о хитном случају (оператер)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Обавештење о хитном случају"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Поруке о емитовању"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Подешавања обавештења о хитном случају"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Обавештења"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Поруке о емитовању"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Укључи обавештења"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Прикажи емитовања обавештења о хитном случају"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Подсетник за обавештења"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Дозволи обавештења"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Примај хитна обавештења"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Звук подсетника за обавештења"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Изговорите поруку обавештења"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Користите опцију претварања текста у говор за изговарање порука обавештења о хитном случају"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS подешавања"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Прикажи ETWS пробна емитовања"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Прикажи пробна емитовања за систем упозорења о земљотресу и цунамију"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Прикажи екстремне опасности"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Приказује упозорења о екстремној опасности по живот и имовину"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Прикажи озбиљне претње"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Приказује упозорења о озбиљној опасности по живот и имовину"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Прикажи AMBER упозорења"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Приказује ванредне објаве у вези са отмицом детета (AMBER упозорење)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Прикажи CMAS пробна емитовања"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Приказује пробне преносе за Комерцијални систем упозорења за мобилне уређаје (CMAS)"</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">"Пробна емитовања за систем упозорења о земљотресу и цунамију (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Екстремне опасности"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Екстремна опасност по живот и имовину"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Озбиљне опасности"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Озбиљна опасност по живот и имовину"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER обавештења"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Објаве у вези са отмицом детета"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS пробна емитовања"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Пробна емитовања за Комерцијални систем упозорења за мобилне уређаје (CMAS)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вибрирај"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Користи највећу јачину звука"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Занемарује друга подешавања за Јачину звука и Не узнемиравај"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Обавештења о ажурирању подручја"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Приказуј информације о ажурирању у статусу SIM картице"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Обавештења о ажурирању подручја"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Приказуј информације о ажурирању у статусу SIM картице"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Опције за програмера"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категорија упозорења:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофизичка"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 975e403..fd84b4d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell Broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Cellsändningsinställningar"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Varningar vid nödsituationer"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Inställningarna för cellsändning är inte tillgängliga för den här användaren"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Det finns inga aktiva varningar i ditt område. Du kan ändra inställningarna för vilka varningar som visas i menyalternativet Inställningar."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Varning om nödsituation (operatör)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Varning om nödsituation"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sändningsmeddelanden"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Inställningar för varningar om nödsituationer"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Varningar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sändningsmeddelanden"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Aktivera meddelanden"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Visa sändningar av varningsmeddelanden"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Påminnelse"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Tillåt varningar"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Ta emot aviseringar vid nödsituationer"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Ljud för varningspåminnelser"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Tala in varningsmeddelande"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Använd text-till-tal när du vill tala in varningsmeddelanden"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Inställningar för varningssystemet ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Visa testsändningar från ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Visa testsändningar för varningssystemet för jordbävningar och tsunami (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Visa varningar om extrem fara"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Visa varningar om extrem fara för liv och egendom"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Visa allvarliga faror"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Visa varningar om allvarlig fara för liv och egendom"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Visa AMBER-meddelanden"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Visa larmmeddelanden om bortförda barn (AMBER-meddelanden)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Visa testsändningar från CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Visa testsändningar från Commercial Mobile Alert System"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historik över nödvarningar"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Varningsinställningar"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Testsändningar från ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testsändningar för varningssystemet för jordbävningar och tsunami (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extrema hot"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extrem fara för liv och egendom"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Allvarliga hot"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Allvarlig fara för liv och egendom"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-varningar"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Nödmeddelanden om bortförda barn"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Testsändningar från CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testsändningar från Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrera"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Använd högsta volym"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignorera andra inställningar för volym och Stör ej"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Sändningar för områdesuppdateringar"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Visa uppdateringsinformation i SIM-statusen"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Sändningar för områdesuppdateringar"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Visa uppdateringsinformation i SIM-statusen"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Utvecklaralternativ"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Varningskategori:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysiska"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Du får för närvarande varningsmeddelanden. Vill du fortsätta ta emot varningsmeddelanden?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ja"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nej"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Historik över varningar om nödsituation"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Varningshistorik om nödsituation"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"En gång"</item>
     <item msgid="9097229303902157183">"Varannan minut"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 440659d..da62c29 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Matangazo ya simu"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Mipangilio ya Matangazo ya simu"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Arifa za dharura"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Mipangilio ya matangazo ya simu za mkononi haipatikani kwa mtumiaji huyu"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Sawa"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Hakuna matangazo ya simu yanayoendelea katika eneo lako. Unaweza kubadilisha mipangilio ya Arifu kwa kutumia menyu ya Mipangilio."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Arifa ya dharura (mtoa huduma)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Arifa ya dharura"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Ujumbe kwa wapokeaji wengi"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Mipangilio ya arifa za dharura"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Arifa"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Ujumbe kwa wapokeaji wengi"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Ruhusu arifa ziingie"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Onyesha matangazo ya arifa za dharura"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Kikumbusho cha arifa"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Ruhusu arifa"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Pokea arifa za dharura"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Kikumbusho cha arifa kilie"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Tamka ujumbe wa ilani"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Tumia kipengele cha kusoma maandishi kwa sauti kusoma ujumbe wowote wa dharura"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Mipangilio ya ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Onyesha matangazo ya majaribio ya ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Onyesha matangazo ya majaribio kuhusu Tetemeko la ardhi la Tsunami"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Vitisho vikali: onyesha arifa"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Onyesha arifa za vitisho vikali kwa maisha na mali"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Vitisho vikali: onyesha arifa"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Onyesha arifa za vitisho vikali kwa maisha na mali"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Onyesha arifa za AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Onyesha taarifa za dharura za kutekwa nyara kwa watoto (arifa za AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Onyesha matangazo ya majaribio ya CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Onyesha matangazo ya majaribio ya Mfumo wa Biashara wa Arifu ya Simu ya Mkononi"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Jaribio la matangazo ya ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Jaribio la matangazo ya Mfumo wa Ilani za Zilizala ya Tsunami"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Vitisho hatari zaidi"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Arifa za mambo yanayotishia maisha na mali"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Vitisho hatari"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Vitisho vikali kwa maisha na mali"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Arifa za AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Taarifa za dharura kuhusu utekaji nyara wa watoto"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Jaribio la matangazo ya CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Jaribio la matangazo ya Mfumo wa Biashara wa Arifa za Simu za Mkononi"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Tetema"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Tumia sauti kamili"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Puuza mapendeleo mengine ya Usinisumbue na sauti"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Matangazo ya taarifa ya eneo"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Onyesha maelezo ya taarifa kwenye hali ya SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Matangazo ya taarifa ya eneo"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Onyesha maelezo ya taarifa kwenye hali ya SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Chaguo za wasanidi programu"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kitengo cha Arifa:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Jiofizikia"</string>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index b61bc83..9bf2cca 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"செல் அலைபரப்புகள்"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"செல் அலைபரப்பு அமைப்பு"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"அவசரகால எச்சரிக்கைகள்"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"இவரால் செல் பிராட்காஸ்ட் அமைப்புகளை மாற்ற முடியாது"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"சரி"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"உங்கள் பகுதியில் செயலில் உள்ள விழிப்பூட்டல்கள் எதுவும் இல்லை. அமைப்பு மெனு என்ற விருப்பத்தைப் பயன்படுத்தி விழிப்பூட்டல் அமைப்புகளை மாற்றலாம்."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"நீங்கள் வசிக்கும் பகுதியில் எந்த ஆபத்தும் இல்லை. அமைப்புகள் மெனுவில் பயன்படுத்தி விழிப்பூட்டல் அமைப்புகளை மாற்றிக் கொள்ளலாம்."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"அமைப்பு"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"அலைபரப்புகளை நீக்கு"</string>
     <string name="message_options" msgid="3178489901903589574">"செய்தி விருப்பங்கள்"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"அவசரகால எச்சரிக்கை (ஆபரேட்டர்)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"அவசரகால எச்சரிக்கை"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"வலைபரப்புச் செய்திகள்"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"அவசரகால எச்சரிக்கை அமைப்பு"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"எச்சரிக்கைகள்"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"வலைபரப்புச் செய்திகள்"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"அறிவிப்புகளை இயக்கு"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"அவசரகால எச்சரிக்கை அலைபரப்புகளைக் காட்டு"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"விழிப்பூட்டலுக்கான நினைவூட்டல்"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"எச்சரிக்கைகளை அனுமதி"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"அவசரகால அறிவிப்புகளைப் பெறு"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"எச்சரிக்கை ஒலி"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"பேச்சு விழிப்பூட்டல் செய்தி"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"அவசரகால எச்சரிக்கை செய்திகளைக் கூறுவதற்கு உரை வடிவ பேச்சைப் பயன்படுத்து"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS அமைப்பு"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS சோதனை அலைபரப்புகளைக் காட்டு"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"பூகம்பம் மற்றும் சுனாமி எச்சரிக்கை அமைப்பின் சோதனை அலைபரப்புகளைக் காட்டு"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"தீவிர அச்சுறுத்தல்களைக் காட்டு"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"வாழ்க்கை மற்றும் சொத்துக்குரிய தீவிர அச்சுறுத்தல்களுக்கான விழிப்பூட்டல்களைக் காண்பி"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"கடுமையான அச்சுறுத்தல்களைக் காட்டு"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"வாழ்க்கை மற்றும் சொத்துக்குரிய கடுமையான அச்சுறுத்தல்களுக்கான விழிப்பூட்டல்களைக் காட்டு"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER விழிப்பூட்டல்களைக் காட்டு"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"குழந்தைக் கடத்தல் அவசரகால அறிவிப்புகளைக் காண்பி (AMBER எச்சரிக்கை)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS சோதனை அலைபரப்புகளைக் காட்டு"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"வணிக மொபைல் எச்சரிக்கை அமைப்பின் சோதனை அலைபரப்புகளைக் காட்டு"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"முன்னர் வந்த அவசரகால எச்சரிக்கை செய்திகள்"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"எச்சரிக்கை விருப்பத்தேர்வுகள்"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS சோதனை வலைபரப்புகள்"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"பூகம்பம் மற்றும் சுனாமி எச்சரிக்கை அமைப்பிற்கான சோதனை வலைபரப்புகள்"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"மிகக் கடுமையான அச்சுறுத்தல்கள்"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"உயிருக்கும் உடைமைக்கும் மிகக் கடுமையான அச்சுறுத்தல்கள்"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"கடுமையான அச்சுறுத்தல்கள்"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"உயிருக்கும் உடைமைக்கும் கடுமையான அச்சுறுத்தல்கள்"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER எச்சரிக்கைகள்"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"குழந்தைக் கடத்தல் குறித்த அறிவிப்புகள்"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS சோதனை வலைபரப்புகள்"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"வணிக மொபைல் எச்சரிக்கை அமைப்பிற்கான சோதனை வலைபரப்புகள்"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"அதிர்வு"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"முழு ஒலியைப் பயன்படுத்து"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"மற்ற ஒலி மற்றும் தொந்தரவு செய்ய வேண்டாம் விருப்பத்தேர்வுகளைப் புறக்கணிக்கும்"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"பகுதி பற்றிய புதிய பிராட்காஸ்ட் அறிவிப்புகள்"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"சிம் நிலையில் புதிய தகவலைக் காட்டு"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"பகுதி பற்றிய புதிய பிராட்காஸ்ட் அறிவிப்புகள்"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"சிம் நிலையில் புதிய தகவலைக் காட்டு"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"டெவெலப்பர் விருப்பங்கள்"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"விழிப்பூட்டல் வகை:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"புவியமைப்பியல்"</string>
@@ -108,12 +109,12 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"தற்போது நீங்கள் அவசரநிலை விழிப்பூட்டல்களைப் பெறுகிறீர்கள். அவசரநிலை விழிப்பூட்டல்கள் பெறுவதைத் தொடர விரும்புகிறீர்களா?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"ஆம்"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"வேண்டாம்"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"அவசரகால எச்சரிக்கை வரலாறு"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"முன்னர் வந்த அவசரகால எச்சரிக்கை செய்திகள்"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ஒருமுறை மட்டும்"</item>
     <item msgid="9097229303902157183">"2 நிமிடங்களுக்கு ஒருமுறை"</item>
     <item msgid="5718214950343391480">"5 நிமிடங்களுக்கு ஒருமுறை"</item>
     <item msgid="3863339891188103437">"15 நிமிடங்களுக்கு ஒருமுறை"</item>
-    <item msgid="6868848414437854609">"முடக்கு"</item>
+    <item msgid="6868848414437854609">"ஆஃப்"</item>
   </string-array>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6107afd..d6fe7e8 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"సెల్ ప్రసారాలు"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"సెల్ ప్రసార సెట్టింగ్‌లు"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"అత్యవసర హెచ్చరికలు"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ఈ వినియోగదారుకు సెల్ ప్రసార సెట్టింగ్‌లు అందుబాటులో లేవు"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"సరే"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"మీ ప్రాంతంలో సక్రియ హెచ్చరికలు ఏవీ లేవు. మీరు సెట్టింగ్‌ల మెను ఎంపికను ఉపయోగించి హెచ్చరిక సెట్టింగ్‌లను మార్చవచ్చు."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"అత్యవసర హెచ్చరిక (ఆపరేటర్)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"అత్యవసర హెచ్చరిక"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ప్రసార సందేశాలు"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"అత్యవసర హెచ్చరిక సెట్టింగ్‌లు"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"హెచ్చరికలు"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ప్రసార సందేశాలు"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"నోటిఫికేషన్‌లను ప్రారంభించు"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"అత్యవసర హెచ్చరిక ప్రసారాలను ప్రదర్శించు"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"హెచ్చరిక రిమైండర్"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"హెచ్చరికలను అనుమతించండి"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"అత్యవసర నోటిఫికేషన్‌లను స్వీకరించు"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"హెచ్చరిక రిమైండర్ ధ్వని"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"హెచ్చరిక సందేశాన్ని చదివి వినిపించు"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"అత్యవసర హెచ్చరిక సందేశాలను చదివి వినిపించడానికి వచన ప్రసంగాన్ని ఉపయోగించు"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS సెట్టింగ్‌లు"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS పరీక్ష ప్రసారాలను చూపు"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"భూకంపం సునామీ హెచ్చరిక సిస్టమ్ కోసం పరీక్ష ప్రసారాలను ప్రదర్శించు"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"అత్యంత తీవ్ర అపాయాలను చూపు"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"ప్రాణానికి మరియు ఆస్తికి అత్యంత తీవ్ర ముప్పు వాటిల్లే అపాయాలకు హెచ్చరికలను ప్రదర్శించు"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"తీవ్ర అపాయాలను చూపు"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"ప్రాణానికి మరియు ఆస్తికి తీవ్ర ముప్పు వాటిల్లే అపాయాలకు హెచ్చరికలను ప్రదర్శించు"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"ఆంబర్ హెచ్చరికలను చూపు"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"పిల్లల అపహరణ అత్యవసర బులెటిన్‌లు (ఆంబర్ హెచ్చరిక) ప్రదర్శించు"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS పరీక్ష ప్రసారాలను చూపు"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"వాణిజ్య మొబైల్ హెచ్చరిక సిస్టమ్ కోసం పరీక్ష ప్రసారాలను ప్రదర్శించు"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"అత్యవసర హెచ్చరికల చరిత్ర"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"హెచ్చరిక ప్రాధాన్యతలు"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS పరీక్ష ప్రసారాలు"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"భూకంపం సునామీ హెచ్చరిక సిస్టమ్ కోసం పరీక్ష ప్రసారాలు"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"అత్యంత తీవ్ర అపాయాలు"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ప్రాణానికి మరియు ఆస్తికి అత్యంత తీవ్ర అపాయాలు"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"తీవ్ర అపాయాలు"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ప్రాణానికి మరియు ఆస్తికి తీవ్ర అపాయాలు"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER హెచ్చరికలు"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"పిల్లల అపహరణ అత్యవసర బులెటిన్‌లు"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS పరీక్ష ప్రసారాలు"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"వాణిజ్య మొబైల్ హెచ్చరిక సిస్టమ్ కోసం పరీక్ష ప్రసారాలు"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"వైబ్రేట్ చేయడం"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"పూర్తి వాల్యూమ్‌ను ఉపయోగించు"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ఇతర వాల్యూమ్ మరియు అంతరాయం కలిగించవద్దు ప్రాధాన్యతలను విస్మరిస్తుంది"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"ప్రాంతీయ అప్‌డేట్ ప్రసారాలు"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM స్థితిలో అప్‌డేట్ సమాచారాన్ని చూపు"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ప్రాంతీయ అప్‌డేట్ ప్రసారాలు"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM స్థితిలో అప్‌డేట్ సమాచారాన్ని చూపు"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"డెవలపర్ ఎంపికలు"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"హెచ్చరిక వర్గం:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"భూభౌతిక సంబంధితం"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 1a4e256..e1376be 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Cell Broadcasts"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"การตั้งค่าการส่งข้อมูลเตือนภัยทางมือถือ"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"การแจ้งเตือนเหตุฉุกเฉิน"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"การตั้งค่าการส่งข้อมูลเตือนภัยทางมือถือ (CB) ไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ตกลง"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"ไม่มีการแจ้งเตือนในพื้นที่ของคุณ คุณสามารถเปลี่ยนการตั้งค่าการแจ้งเตือนได้ในตัวเลือกเมนูการตั้งค่า"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"การแจ้งเตือนฉุกเฉิน (ผู้ให้บริการ)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"การแจ้งเตือนฉุกเฉิน"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"ข้อความการแจ้งเตือน"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"การตั้งค่าการแจ้งเตือนฉุกเฉิน"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"การแจ้งเตือน"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"ข้อความการออกอากาศ"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"เปิดการแจ้งเตือน"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"แสดงการส่งการแจ้งเตือนฉุกเฉิน"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"การช่วยเตือนซ้ำ"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"อนุญาตการแจ้งเตือน"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"รับการแจ้งเตือนฉุกเฉิน"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"เสียงการช่วยเตือนซ้ำ"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"อ่านข้อความแจ้งเตือน"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"ใช้การอ่านออกเสียงข้อความเพื่ออ่านข้อความแจ้งเตือนฉุกเฉิน"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"การตั้งค่า ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"แสดงการทดสอบการแจ้งเตือน ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"แสดงการส่งข้อความทดสอบสำหรับระบบแจ้งเตือนแผ่นดินไหวและสึนามิ"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"แสดงภัยคุกคามระดับสูงสุด"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"แสดงการแจ้งเตือนสำหรับภัยคุกคามต่อชีวิตและทรัพย์สินระดับสูงสุด"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"แสดงภัยคุกคามระดับรุนแรง"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"แสดงการแจ้งเตือนภัยคุกคามต่อชีวิตและทรัพย์สินระดับรุนแรง"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"แสดงการแจ้งเตือน AMBER Alert"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"แสดงกระดานข่าวสารเหตุฉุกเฉินการลักพาตัวเด็ก (AMBER Alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"แสดงการทดสอบการแจ้งเตือนของ CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"แสดงการทดสอบการแจ้งเตือนสำหรับ Commercial Mobile Alert System"</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 Alert"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"กระดานข่าวสารเหตุฉุกเฉินการลักพาตัวเด็ก"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"การทดสอบการแจ้งเตือนของ CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"การทดสอบการแจ้งเตือนสำหรับ Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"สั่น"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ใช้เสียงเต็มระดับ"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ละเว้นระดับเสียงอื่นๆ และค่ากำหนด \"ห้ามรบกวน\""</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"การเผยแพร่การอัปเดตในพื้นที่"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"แสดงข้อมูลอัปเดตในสถานะซิม"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"การเผยแพร่การอัปเดตในพื้นที่"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"แสดงข้อมูลอัปเดตในสถานะซิม"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ตัวเลือกสำหรับนักพัฒนาซอฟต์แวร์"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"หมวดหมู่การแจ้งเตือน:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ธรณีฟิสิกส์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index c5216be..7e4be49 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Mga Cell Broadcast"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Mga setting ng Cell Broadcast"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Mga alertong pang-emergency"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Hindi available ang mga setting ng Cell Broadcast para sa user na ito"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Walang mga aktibong alerto sa lugar mo. Mababago mo ang mga setting ng Alerto gamit ang menu option ng Mga Setting."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alertong pang-emergency (tagapagpatakbo)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alertong pang-emergency"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Mga mensahe ng broadcast"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Mga setting ng alertong pang-emergency"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Mga Alerto"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Mga mensahe ng broadcast"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"I-on ang mga notification"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Ipakita ang mga broadcast ng alertong pang-emergency"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Alertong paalala"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Payagan ang mga alerto"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Makatanggap ng mga pang-emergency na notification"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Tunong ng paalala ng alerto"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Magsalita ng mensaheng alerto"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Gamitin ang text-to-speech upang magsalita ng mga mensahe ng alertong pang-emergency"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Mga setting ng ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Magpakita ng mga pansubok na broadcast ng ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Ipakita ang mga pagsubok na broadcast para sa System ng Babala sa Lindol Tsunami"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Ipakita ang matitinding banta"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Magpakita ng mga alerto para sa matitinding banta sa buhay at ari-arian"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Ipakita ang malulubhang banta"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Magpakita ng mga alerto para sa malulubhang banta sa buhay at ari-arian"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Ipakita ang mga AMBER alert"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Magpakita ng mga bulletin ng emergency sa pagdukot sa bata (AMBER alert)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Magpakita ng mga pansubok na broadcast ng CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Magpakita ng mga pansubok na broadcast para sa Commercial Mobile Alert System"</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>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Pansubok na broadcast ng ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Mga pansubok na broadcast ng Earthquake Tsunami Warning System"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Matitinding banta"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Matitinding banta sa buhay at ari-arian"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Malulubhang banta"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Malulubhang banta sa buhay at ari-arian"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Mga AMBER alert"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Mga pang-emergency na bulletin para sa pagdukot ng bata"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Pansubok na broadcast ng CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Mga pansubok na broadcast para sa Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Mag-vibrate"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Gamitin ang sagad na volume"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Balewalain ang mga kagustuhan sa volume at Huwag Istorbohin"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Mga broadcast sa pag-update sa lugar"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Ipakita ang impormasyon ng pag-update sa status ng SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Mga broadcast sa pag-update sa lugar"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Ipakita ang impormasyon ng pag-update sa status ng SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Mga pagpipilian ng developer"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorya ng Alerto:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e9ede6e..7d453cf 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Hücre Yayınları"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Hücre Yayını ayarları"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Acil durum uyarıları"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Bu kullanıcı için Hücre Yayını ayarları yapılamıyor"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Tamam"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Bölgenizde aktif uyarı yok. Uyarı ayarlarını Ayarlar menü seçeneğini kullanarak değiştirebilirsiniz."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Acil durum uyarısı (operatör)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Acil durum uyarısı"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Yayın mesajları"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Acil durum ayarları"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Uyarılar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Yayın mesajları"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Bildirimleri aç"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Acil durum uyarısı yayınlarını görüntüle"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Uyarı hatırlatıcı"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Uyarılara izin ver"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Acil durum bildirimleri alın"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Uyarı hatırlatıcı sesi"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Uyarı mesajını seslendir"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Acil durum uyarı mesajları için metin-konuşma özelliğini kullan"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS ayarları"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS test yayınlarını göster"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Deprem Tsunami Uyarı Sistemi için test yayınlarını görüntüle"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Ekstrem tehditleri göster"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Cana ve mala karşı ekstrem tehditlerle ilgili uyarıları görüntüle"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Şiddetli tehditleri göster"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Cana ve mala karşı şiddetli tehditlerle ilgili uyarıları görüntüle"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"SARI uyarıları göster"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Çocuk kaçırma acil durum (AMBER uyarı) bültenlerini görüntüle"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS test yayınlarını göster"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Ticari Mobil Uyarı Sistemi (CMAS) test yayınlarını görüntüle"</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>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Deprem Tsunami Uyarı Sistemi için test yayınları"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Aşırı düzeyde tehditler"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Cana ve mala karşı aşırı düzeyde tehditler"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ciddi tehditler"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Cana ve mala karşı ciddi tehditler"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER uyarıları"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Çocuk kaçırma acil durum bültenleri"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS test yayınları"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Ticari Mobil Uyarı Sistemi (CMAS) test yayınları"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Titreşim"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"En yüksek sesi kullan"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Diğer ses ve Rahatsız Etme tercihlerini yok say"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Alan güncelleme yayınları"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM durumunda güncelleme bilgilerini göster"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Alan güncelleme yayınları"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM durumunda güncelleme bilgilerini göster"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Geliştirici seçenekleri"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Uyarı Kategorisi:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Jeofizik"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 95ecc73..fe2bbbc 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Сповіщення оператора"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Налаштування"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Екстрені сповіщення"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Налаштування широкомовних інформаційних повідомлень недоступні для цього користувача"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Немає активних сповіщень у вашій області. Параметри сповіщень можна змінити в меню \"Налаштування\"."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Сповіщення про надзвичайну ситуацію (оператор)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Сповіщення про надзвичайну ситуацію"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Широкомовні сповіщення"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Налаштування сповіщень про надзвичайні ситуації"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Сповіщення"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Широкомовні повідомлення"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Увімкнути сповіщення"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Показувати сповіщення про надзвичайні ситуації"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Нагадування"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Дозволити сповіщення"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Отримувати екстрені сповіщення"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Сигнал нагадування"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Промовляти сповіщення"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Використовувати синтез мовлення, щоб диктувати тексти сповіщень про надзвичайні ситуації"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Налаштування системи ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Тестові розсилки ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Відобразити тестові широкомовні повідомлення системи застережень щодо землетрусів і цунамі (ETWS)"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Показувати надзвичайні загрози"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Показувати сповіщення про загрози надзвичайного рівня для життя та майна"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Показувати високі загрози"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Показувати сповіщення про загрози високого рівня для життя та майна"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Показувати сповіщення AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Показувати інформаційні повідомлення про викрадення дітей (сповіщення AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Тестові розсилки CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Показувати тестові широкомовні повідомлення комерційної системи мобільних сповіщень (CMAS)"</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">"Пробні широкомовні сповіщення системи застережень щодо землетрусів і цунамі (ETWS)"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Надзвичайні загрози"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Надзвичайні загрози життю та майну"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Серйозні загрози"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Серйозні загрози життю та майну"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Сповіщення AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Екстрені сповіщення про викрадення дітей"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Пробні сповіщення CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Пробні широкомовні сповіщення комерційної системи мобільних сповіщень (CMAS)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Вібросигнал"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Використовувати повну гучність"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ігнорувати інші параметри гучності й режиму \"Не турбувати\""</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Широкомовні сповіщення про регіональні оновлення"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Показувати інформацію про оновлення в статусі SIM-карти"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Широкомовні сповіщення про регіональні оновлення"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Показувати інформацію про оновлення в статусі SIM-карти"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Параметри розробника"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Категорія сповіщення:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Геофізична небезпека"</string>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 87ad08a..f78bc77 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"سیل براڈکاسٹس"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"سیل براڈکاسٹ کی ترتیبات"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"ایمرجنسی الرٹس"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"سیل براڈکاسٹ کی ترتیبات اس صارف کیلئے دستیاب نہیں ہیں"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ٹھیک ہے"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"آپ کے علاقے میں کوئی فعال الرٹس نہیں ہیں۔ آپ ترتیبات مینو کا اختیار استعمال کرکے الرٹ کی ترتیبات تبدیل کر سکتے ہیں۔"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"ہنگامی الرٹ (آپریٹر)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"ہنگامی الرٹ"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"براڈ کاسٹ کے پیغامات"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"ہنگامی الرٹ کی ترتیبات"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"الرٹس"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"براڈ کاسٹ کے پیغامات"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"اطلاعات آن کریں"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"ہنگامی الرٹس کے براڈکاسٹ ڈسپلے کریں"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"الرٹ کی یاد دہانی"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"انتباہات کی اجازت دیں"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"ایمرجنسی اطلاعات وصول کریں"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"الرٹ کی یاد دہانی کی آواز"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"الرٹ کا پیغام بولیں"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"ہنگامی الرٹ کے پیغامات بولنے کیلئے ٹیکسٹ ٹو اسپیچ کا استعمال کریں"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"‏ETWS ترتیبات"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"‏ETWS ٹیسٹ براڈکاسٹ دکھائیں"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"زلزلہ سونامی وارننگ سسٹم کیلئے ٹیسٹ براڈکاسٹ ڈسپلے کریں"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"انتہائی خطرات دکھائیں"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"زندگی اور املاک کے انتہائی خطرات کیلئے الرٹس ڈسپلے کریں"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"شدید خطرات دکھائیں"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"زندگی اور املاک کے شدید خطرات کیلئے الرٹس ڈسپلے کریں"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"‏AMBER الرٹس دکھائیں"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"‏بچوں کے اغوا کی ہنگامی بلیٹینز (AMBER الرٹ) ڈسپلے کریں"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"‏CMAS ٹیسٹ براڈکاسٹ دکھائیں"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"کمرشل موبائل الرٹ سسٹم کیلئے ٹیسٹ براڈکاسٹ ڈسپلے کریں"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"ایمرجنسی الرٹ کی سر گزشت"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"الرٹ کی ترجیحات"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"‏ETWS ٹیسٹ براڈکاسٹس"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"زلزلہ سونامی وارننگ سسٹم کیلئے ٹیسٹ براڈکاسٹس"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"انتہائی خطرات"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"زندگی اور املاک کو انتہائی خطرات"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"شدید خطرات"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"زندگی اور املاک کو شدید خطرات"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏AMBER الرٹس"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"بچوں کے اغوا کی ایمرجنسی بلیٹینز"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"‏CMAS ٹیسٹ براڈکاسٹس"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"کمرشل موبائل الرٹ سسٹم کیلئے ٹیسٹ براڈکاسٹس"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"وائبریٹ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"پورا والیوم استعمال کریں"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"دیگر والیوم اور ڈسٹرب نہ کریں کی ترجیحات کو نظر انداز کریں"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"علاقائی اپ ڈیٹ کے نشریات"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"‏SIM کی صورتحال میں موجود اپ ڈیٹ کی معلومات دکھائیں"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"علاقائی اپ ڈیٹ کے نشریات"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"‏SIM کی صورتحال میں موجود اپ ڈیٹ کی معلومات دکھائیں"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ڈیولپر کے اختیارات"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"الرٹ کا زمرہ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ارضی طبیعیات سے متعلق"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 2e1ba55..a0d9eb4 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Aholini ogohlantirish"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Aholini ogohlantirish sozlamalari"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Favqulodda ogohlantirishlar"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Ushbu foydalanuvchi uchun Aholini ogohlantirish sozlamalari mavjud emas"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Ayni paytda siz joylashgan hudud uchun hech qanday faol ogohlantirish yo‘q. Ogohlantirish parametrlarini Sozlamalar menyusidan o‘zgartirish mumkin."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Favqulodda ogohlantirish (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Favqulodda ogohlantirish"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Tarqatma xabarlar"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Favqulodda ogohlantirish sozlamalari"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Ogohlantirishlar"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Tarqatma xabarlar"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Bildirishnomalarni yoqish"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Favqulodda ogohlantirish xabarlarini ko‘rsatish"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Eslatmalar davriyligi"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Ogohlantirishlarga ruxsat"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Favqulodda bildirishnomalar olish"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Eslatma tovushi"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ogohlan. xabarini eshitish"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Favqulodda ogohlantirish xabarlarini eshitish uchun matndan-nutqqa vositasidan foydalanish"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Zilzila va sunamidan ogohlantirish sozlamalari"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS sinov xabar-ni ko‘rsatish"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Zilzila va sunamidan ogohlantirish tizimi (ETWS) yuborgan sinov tarqatma xabarlarini ko‘rsatish"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Keskin xatarlar"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Inson hayoti va mulkiga nisbatan keskin xatarlar haqida ogohlantirish"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Jiddiy xatarlar"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Inson hayoti va mulkiga nisbatan jiddiy xatarlar haqida ogohlantirish"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER ogohlantirishlari"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Yo‘qolgan bolalar haqida xabar qilish"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS sinov xabar-ni ko‘rsatish"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Tijoriy mobil ogohlantirish tizimi (CMAS) yuborgan sinov tarqatma xabarlarini ko‘rsatish"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Favqulodda xabarlar arxivi"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Ogohlantirish parametrlari"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS sinov xabarlari"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Zilzila va sunamidan ogohlantirish tizimi (ETWS) uchun sinov tarqatma xabarlari"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Keskin xatarlar"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Inson hayoti va mulkiga nisbatan keskin xatarlar"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Jiddiy xatarlar"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Inson hayoti va mulkiga nisbatan jiddiy xatarlar"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER ogohlantirishlari"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Yo‘qolgan bolalar haqida xabar qilish"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS sinov xabarlari"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Tijoriy mobil ogohlantirish tizimi (CMAS) uchun sinov tarqatma xabarlari"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Tebranish"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Maksimal ovoz balandligidan foydalanish"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Boshqa ovoz balandligi va Bezovta qilinmasin rejimi sozlamalarini inkor etish"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Favqulodda ogohlantirishlar"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"SIM holati panelida yangilash axborotini ko‘rsatish"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Favqulodda ogohlantirishlar"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM holati panelida yangilash axborotini ko‘rsatish"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Dasturchi sozlamalari"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Ogohlantirish toifasi:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Zilzila"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4fd70c6..3263c84 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Phát sóng trên di động"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Cài đặt phát sóng trên di động"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Thông báo khẩn cấp"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Cài đặt truyền phát trên di động không khả dụng cho người dùng này"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Không có thông báo hoạt động nào trong khu vực của bạn. Bạn có thể thay đổi cài đặt Thông báo bằng tùy chọn menu Cài đặt."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Không có cảnh báo hoạt động nào trong khu vực của bạn. Bạn có thể thay đổi cài đặt Cảnh báo bằng tùy chọn menu Cài đặt."</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>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Cảnh báo khẩn cấp (nhà cung cấp dịch vụ)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Thông báo khẩn cấp"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Thông báo truyền phát"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Cài đặt thông báo khẩn cấp"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Thông báo"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Thông báo truyền phát"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Bật thông báo"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Hiển thị các chương trình phát sóng báo động khẩn cấp"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Lời nhắc thông báo"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Cho phép thông báo"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Nhận thông báo khẩn cấp"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Âm thanh lời nhắc thông báo"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Đọc tin nhắn báo động"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Sử dụng tính năng chuyển văn bản thành giọng nói để đọc các tin nhắn báo động khẩn cấp"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Cài đặt ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Hiển thị các thông báo kiểm tra cho ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Hiển thị chương trình phát sóng thử nghiệm cho Hệ thống cảnh báo động đất và sóng thần"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Hiển thị đe dọa rất nghiêm trọng"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Hiển thị thông báo cho các mối đe dọa đến sinh mạng và tài sản cực kỳ nghiêm trọng"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Hiển thị đe dọa nghiêm trọng"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Hiển thị thông báo cho các mối đe dọa đến sinh mạng và tài sản nghiêm trọng"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Hiển thị thông báo AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Hiển thị bản tin khẩn cấp vụ việc bắt cóc trẻ em (thông báo AMBER)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Hiển thị các thông báo kiểm tra cho CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Hiển thị các thông báo kiểm tra cho Hệ thống thông báo thương mại trên điện thoại di động"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Lịch sử cảnh báo khẩn cấp"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Tùy chọn thông báo"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Thông báo thử nghiệm cho ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Thông báo thử nghiệm cho Hệ thống cảnh báo động đất và sóng thần"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Mối đe dọa cực kỳ nghiêm trọng"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Mối đe dọa đến sinh mạng và tài sản cực kỳ nghiêm trọng"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Mối đe dọa nghiêm trọng"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Mối đe dọa đến sinh mạng và tài sản nghiêm trọng"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Cảnh báo AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bản tin khẩn cấp vụ việc bắt cóc trẻ em"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Thông báo thử nghiệm cho CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Thông báo thử nghiệm cho Hệ thống thông báo thương mại trên điện thoại di động"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Rung"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Sử dụng mức âm lượng cao nhất"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Bỏ qua tùy chọn âm lượng khác và Không làm phiền"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Chương trình phát sóng thông tin cập nhật khu vực"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Hiển thị thông tin cập nhật trong trạng thái SIM"</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>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Hiển thị thông tin cập nhật trong trạng thái SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Tùy chọn nhà phát triển"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Danh mục cảnh báo:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Địa vật lý"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Bạn hiện đang nhận được Thông báo khẩn cấp. Bạn có muốn tiếp tục nhận được Thông báo khẩn cấp không?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Có"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Không"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Lịch sử thông báo khẩn cấp"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Lịch sử cảnh báo khẩn cấp"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Một lần"</item>
     <item msgid="9097229303902157183">"2 phút một lần"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1760194..a37d667 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"小区广播"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"小区广播设置"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"紧急警报"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"此用户无权修改小区广播设置"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"确定"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"您所在的区域没有任何事件警报。您可以使用“设置”菜单选项更改警报设置。"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"紧急警报(操作人员)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"紧急警报"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"广播消息"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"紧急警报设置"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"警报"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"广播消息"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"开启通知"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"显示紧急警报广播"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"警报提醒"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"允许接收警报"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"接收紧急通知"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"警报提醒提示音"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"读出警报消息"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"使用文字转语音功能读出紧急警报消息"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"地震海啸警报系统 (ETWS) 设置"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"显示 ETWS 测试广播"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"显示地震海啸警报系统的测试广播"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"显示极端威胁"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"显示有关生命财产遭受极端威胁的警报"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"显示严重威胁"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"显示有关生命财产遭受严重威胁的警报"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"显示安珀警报"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"显示儿童遭绑架/拐骗的紧急公告(安珀警报)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"显示CMAS测试广播"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"显示商业移动警报系统 (CMAS) 的测试广播"</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">"地震海啸警报系统 (ETWS) 的测试广播"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"极端威胁"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"生命和财产受到极端威胁"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"严重威胁"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"生命和财产受到严重威胁"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"安珀警报"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"儿童遭绑架/拐骗的紧急公告"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS 测试广播"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"商业移动警报系统 (CMAS) 的测试广播"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"振动"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"使用最大音量"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"忽略其他的音量和“勿扰”偏好设置"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"区域动态信息广播"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"在 SIM 卡状态中显示动态信息"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"区域动态信息广播"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"在 SIM 卡状态中显示动态信息"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"开发者选项"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"警报类别:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"地球物理"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 940eb76..e95df74 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"區域廣播"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"區域廣播設定"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"緊急警報"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"此使用者無法修改區域廣播設定"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"確定"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"您的區域暫時沒有警示。您可以在 [設定] 選單更改 [警示] 設定。"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"您的區域暫時未有警報。您可以在 [設定] 選單更改 [警報] 設定。"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"設定"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"刪除廣播"</string>
     <string name="message_options" msgid="3178489901903589574">"訊息選項"</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急警示 (網絡供應商)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"緊急警示"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"廣播訊息"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"緊急警示設定"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"警報"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"廣播訊息"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"開啟通知"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"顯示緊急警示廣播"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"警示提醒"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"允許接收警報"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"接收緊急通知"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"警報提醒音效"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"說出警示訊息"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"使用文字轉語音功能說出緊急警示訊息"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS 設定"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"顯示 ETWS 測試廣播"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"顯示地震海嘯警報系統測試廣播"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"顯示極嚴重威脅"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"顯示極嚴重的生命財產威脅警示"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"顯示嚴重威脅"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"顯示嚴重的生命財產威脅警示"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"顯示黃色警示"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"顯示誘拐兒童的緊急情況公告 (黃色警示)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"顯示 CMAS 測試廣播"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"顯示商用流動警示系統的測試廣播"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"緊急警報記錄"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"警報偏好設定"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS 測試廣播"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"地震海嘯警報系統測試廣播"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"極嚴重威脅"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"極嚴重的生命財產威脅"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"嚴重威脅"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"嚴重的生命財產威脅"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"黃色警報"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"誘拐兒童緊急事件公告"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS 測試廣播"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"商用流動警報系統測試廣播"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"震動"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"使用最大音量"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"忽略其他音量和「請勿騷擾」偏好設定"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"地區最新資訊廣播"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"在 SIM 卡狀態中顯示最新資訊"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"地區最新資訊廣播"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"在 SIM 卡狀態中顯示最新資訊"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"開發人員選項"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"警報類別:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"地球物理"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"您目前有接收緊急警報,要繼續接收嗎?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"是"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"否"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警示記錄"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警報記錄"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"一次"</item>
     <item msgid="9097229303902157183">"每 2 分鐘提醒一次"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0a76f34..09f9868 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"區域廣播"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"區域廣播設定"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"緊急警示"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"這位使用者無法修改區域廣播設定"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"確定"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"你的區域目前沒有警示。你可以使用選單中的 [設定] 選項變更 [警示] 設定。"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"你的區域目前沒有警示。您可以在 [設定] 選單更改 [警示] 設定。"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"設定"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"刪除廣播"</string>
     <string name="message_options" msgid="3178489901903589574">"訊息選項"</string>
@@ -37,37 +37,38 @@
     <string name="etws_test_message" msgid="8447820262584381894">"地震海嘯警報系統測試訊息"</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_severe_alert" msgid="4135809475315826913">"緊急警示:嚴重"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"兒童綁架 (安珀警報)"</string>
-    <string name="cmas_required_monthly_test" msgid="6464047268150108932">"緊急警示每月測試"</string>
+    <string name="cmas_extreme_alert" msgid="2588720613319969289">"緊急警報"</string>
+    <string name="cmas_severe_alert" msgid="4135809475315826913">"緊急警報"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"緊急警報"</string>
+    <string name="cmas_required_monthly_test" msgid="6464047268150108932">"每月測試用訊息"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"緊急警示 (演習)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急警示 (電信業者自訂)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"緊急警示"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"廣播訊息"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"緊急警示設定"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"警示"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"廣播訊息"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"開啟通知"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"顯示緊急警示廣播"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"快訊提醒"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"允許警示"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"接收緊急通知"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"警示提醒音效"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"說出警示訊息"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"使用文字轉語音功能說出緊急警示訊息"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS 設定"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"顯示 ETWS 測試廣播"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"顯示地震海嘯警報系統測試廣播"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"顯示極嚴重威脅"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"顯示極嚴重生命財產威脅警示"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"顯示嚴重威脅"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"顯示嚴重生命財產威脅警示"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"顯示安珀警示"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"顯示兒童綁架緊急事件公告 (安珀警報)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"顯示 CMAS 測試廣播"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"顯示商用行動警示系統測試廣播"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"緊急警示紀錄"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"警示偏好設定"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS 測試廣播"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"地震海嘯警報系統測試廣播"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"重大威脅"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"重大生命財產威脅"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"嚴重威脅"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"嚴重生命財產威脅"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"安珀警示"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"兒童綁架緊急事件公告"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS 測試廣播"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"商用行動警示系統測試廣播"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"震動"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"使用最大音量"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"忽略其他的音量和「零打擾」偏好設定"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"地區最新資訊廣播"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"在 SIM 卡狀態中顯示最新資訊"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"地區更新資訊廣播"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"在 SIM 卡狀態中顯示更新資訊"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"開發人員選項"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"警示類別:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"地球物理災變"</string>
@@ -108,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"你目前已設為接收緊急警示,是否要繼續接收?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"是"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"否"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警報紀錄"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警示紀錄"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"一次"</item>
     <item msgid="9097229303902157183">"每隔 2 分鐘"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 34beaa7..3a72a44 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Ukusakazwa Kweselula"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Izilungiselelo Zomsakazo Weselula"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Izaziso ezisheshayo"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Izilungiselelo zokusakaza kweselula azitholakaleli lo msebenzisi"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"KULUNGILE"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Azikho izaziso ezisebenzayo endaweni yakini. Ungase ushintshe izilungiselelo Zezaziso usebenzisa inketho yemenyu ethi Izilungiselelo."</string>
@@ -45,29 +45,30 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Isaziso Esiphuthumayo (umqondisi)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Isaziso Esiphuthumayo"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Sakaza imilayezo"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Izilungiselelo Zesaziso Esiphuthumayo"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Izexwayiso"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Sakaza imilayezo"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Vula isaziso"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Bonisa ukusakaza kwesaziso esiphuthumayo"</string>
-    <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Isikhumbuzo sesaziso"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Vumela izexwayiso"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Thola izaziso zesimo esiphuthumayo"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Umsindo wesikhumbuzi sesexwayiso"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Khuluma isaziso somlayezo"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Sebenzisa umbhalo-kuya-olimini ukuze ukhulume imilayezo yesaziso"</string>
-    <string name="category_etws_settings_title" msgid="4072774251965938576">"Izilungiselelo ze-ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Bonisa ukusakaza kokuhlola i-ETWS"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Bonisa isivivinyo sokusakaza Sokundindizela komhlaba Isistimu Yesixwayiso se-Tsunami"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Bonisa izingozi ezinkulu kakhulu"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Bonisa izaziso eziyingozi enkulu kakhulu empilweni kanye nezakhiwo"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Bonisa izingozi ezibucayi"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Bonisa izaziso eziyingozi empilweni kanye nezakhiwo"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Bonisa izaziso ZOMBALA OPHUZI"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Bonisa izindaba ezihamba phambili eziphuthumayo zokuthunjwa kwezingane (isaziso SOMBALA OLUPHUZI)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Bonisa ukusakaza kokuhlola i-CMAS"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Bonisa ukusakazwa Kwesisitimu Yokuxwayisa Ngefoni Yezentengiselwano"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Umlando wesexwayiso esiphuthumayo"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Izintandokazi zesexwayiso"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Ukusakaza kokuhlola i-ETWS"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Hlola isivivinyo sokusakaza Sokundindizela komhlaba Isistimu Yesixwayiso se-Tsunami"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Izinsongo ezinkulu"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ukusongela okuqinile kwempilo nendawo"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Izinsongo ezicindezelayo"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ukusongela okukhulu kwempilo nendawo"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Izexwayiso ze-AMBER"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Izindaba eziphuthumayo zokukhishwa kwengane"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Ukusakaza kokuhlola i-CMAS"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Hlola ukusakazwa Kwesisitimu Yokuxwayisa Ngefoni Yezentengiselwano"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Dlidliza"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Sebenzisa ivolomu ephelele"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Ziba enye ivolomu kanye nezintandokazi zokuthi ungaphazamisi"</string>
-    <string name="enable_area_update_info_alerts_title" msgid="2793444925039251306">"Ukusakazwa kwesibuyekezo sendawo"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="1638919917695623789">"Bonisa ulwazi lokubuyekeza kusimo se-SIM"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Ukusakazwa kwesibuyekezo sendawo"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Bonisa ulwazi lokubuyekeza kusimo se-SIM"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Izinketho Zonjiniyela"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Isigaba sesexwayiso:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Okuphathelene Nomhlaba"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8f595e5..5b14ad2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,38 +88,37 @@
 
     <!-- Preference category title for emergency alert settings. [CHAR LIMIT=50] -->
     <string name="emergency_alerts_title">Alerts</string>
-    <!-- Notification channel name for a channel containing cell broadcast messages notifications. [CHAR LIMIT=30] -->
+    <!-- Notification channel name for a channel containing cell broadcast messages notifications. [CHAR LIMIT=50] -->
     <string name="notification_channel_broadcast_messages">Broadcast messages</string>
-    <!-- Preference title for enable emergency alerts checkbox. [CHAR LIMIT=30] -->
+    <!-- Preference title for enable emergency alerts checkbox. [CHAR LIMIT=50] -->
     <string name="enable_emergency_alerts_title">Allow alerts</string>
     <!-- Preference summaries for allow alerts checkbox. [CHAR LIMIT=50] -->
-    <string name="enable_emergency_alerts_summaryOn">Receive emergency notifications</string>
-    <string name="enable_emergency_alerts_summaryOff">When off, you may still receive mandatory alerts</string>
-    <!-- Preference title for alert reminder interval list. [CHAR LIMIT=30] -->
+    <string name="enable_emergency_alerts_summary">Receive emergency notifications</string>
+    <!-- Preference title for alert reminder interval list. [CHAR LIMIT=50] -->
     <string name="alert_reminder_interval_title">Alert reminder sound</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=30] -->
+    <!-- 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=100] -->
     <string name="enable_alert_speech_summary">Use text-to-speech to speak emergency alert messages</string>
-    <!-- Preference title for emergency alert history. [CHAR LIMIT=30] -->
+    <!-- Preference title for emergency alert history. [CHAR LIMIT=50] -->
     <string name="emergency_alert_history_title">Emergency alert history</string>
 
     <!-- Preference category title for alert preferences. [CHAR LIMIT=50] -->
     <string name="alert_preferences_title">Alert preferences</string>
 
 
-    <!-- Preference title for enable ETWS test alerts checkbox. [CHAR LIMIT=30] -->
+    <!-- Preference title for enable ETWS test alerts checkbox. [CHAR LIMIT=50] -->
     <string name="enable_etws_test_alerts_title">ETWS test broadcasts</string>
     <!-- Preference summary for enable ETWS test alerts checkbox. [CHAR LIMIT=100] -->
     <string name="enable_etws_test_alerts_summary">Test broadcasts for Earthquake Tsunami Warning System</string>
 
-    <!-- Preference title for enable CMAS extreme threat alerts checkbox. [CHAR LIMIT=30] -->
+    <!-- Preference title for enable CMAS extreme threat alerts checkbox. [CHAR LIMIT=50] -->
     <string name="enable_cmas_extreme_threat_alerts_title">Extreme threats</string>
     <!-- Preference summary for enable CMAS extreme threat alerts checkbox. [CHAR LIMIT=100] -->
     <string name="enable_cmas_extreme_threat_alerts_summary">Extreme threats to life and property</string>
-    <!-- Preference title for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=30] -->
+    <!-- Preference title for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=50] -->
     <string name="enable_cmas_severe_threat_alerts_title">Severe threats</string>
     <!-- Preference summary for enable CMAS severe threat alerts checkbox. [CHAR LIMIT=100] -->
     <string name="enable_cmas_severe_threat_alerts_summary">Severe threats to life and property</string>
@@ -128,12 +127,12 @@
     <!-- Preference summary for enable CMAS amber alerts checkbox. [CHAR LIMIT=100] -->
     <string name="enable_cmas_amber_alerts_summary">Child abduction emergency bulletins</string>
 
-    <!-- Preference title for enable CMAS test alerts checkbox. [CHAR LIMIT=30] -->
+    <!-- Preference title for enable CMAS test alerts checkbox. [CHAR LIMIT=50] -->
     <string name="enable_cmas_test_alerts_title">CMAS test broadcasts</string>
     <!-- Preference summary for enable CMAS test alerts checkbox. [CHAR LIMIT=100] -->
     <string name="enable_cmas_test_alerts_summary">Test broadcasts for Commercial Mobile Alert System</string>
 
-    <!-- Preference title for CMAS vibration on/off. [CHAR LIMIT=30] -->
+    <!-- Preference title for CMAS vibration on/off. [CHAR LIMIT=50] -->
     <string name="enable_alert_vibrate_title">Vibrate</string>
 
     <!-- Preference title for use full volume option. [CHAR LIMIT=50] -->
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index add5d5f..71f9a77 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -18,16 +18,15 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <SwitchPreference android:defaultValue="true"
+                      android:key="enable_emergency_alerts"
+                      android:summary="@string/enable_emergency_alerts_summary"
+                      android:title="@string/enable_emergency_alerts_title" />
+
     <!-- Settings to enable / disable emergency alerts -->
     <PreferenceCategory android:title="@string/emergency_alerts_title"
                         android:key="category_emergency_alerts">
 
-        <SwitchPreference android:defaultValue="true"
-                          android:key="enable_emergency_alerts"
-                          android:summaryOn="@string/enable_emergency_alerts_summaryOn"
-                          android:summaryOff="@string/enable_emergency_alerts_summaryOff"
-                          android:title="@string/enable_emergency_alerts_title" />
-
         <!-- Enable CMAS AMBER alerts -->
         <SwitchPreference android:defaultValue="true"
                           android:key="enable_cmas_amber_alerts"
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
index 0c94176..01c0e41 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertAudio.java
@@ -26,6 +26,7 @@
 import android.content.res.AssetFileDescriptor;
 import android.content.res.Resources;
 import android.media.AudioAttributes;
+import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnCompletionListener;
@@ -543,8 +544,8 @@
      * Set volume for alerts.
      */
     private void setAlertVolume() {
-        if (mTelephonyManager.getCallState()
-                != TelephonyManager.CALL_STATE_IDLE) {
+        if (mTelephonyManager.getCallState() != TelephonyManager.CALL_STATE_IDLE
+                || isOnEarphone()) {
             // If we are in a call, play the alert
             // sound at a low volume to not disrupt the call.
             log("in call: reducing volume");
@@ -557,6 +558,22 @@
         }
     }
 
+    private boolean isOnEarphone() {
+        AudioDeviceInfo[] deviceList = mAudioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS);
+
+        for (AudioDeviceInfo devInfo : deviceList) {
+            int type = devInfo.getType();
+            if (type == AudioDeviceInfo.TYPE_WIRED_HEADSET
+                    || type == AudioDeviceInfo.TYPE_WIRED_HEADPHONES
+                    || type == AudioDeviceInfo.TYPE_BLUETOOTH_SCO
+                    || type == AudioDeviceInfo.TYPE_BLUETOOTH_A2DP) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Set volume of STREAM_ALARM to full.
      */
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
index 4a0a9dd..377144c 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertDialog.java
@@ -355,7 +355,7 @@
                 getApplicationContext(), message);
 
         String title = getText(titleId).toString();
-        TextView titleTextView = (TextView) findViewById(R.id.alertTitle);
+        TextView titleTextView = findViewById(R.id.alertTitle);
 
         if (getApplicationContext().getResources().getBoolean(R.bool.show_date_time_title)) {
             titleTextView.setSingleLine(false);
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
index 69dc4d2..52f2230 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertReminder.java
@@ -24,13 +24,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.IBinder;
 import android.os.SystemClock;
+import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -111,9 +111,7 @@
         if (enableVibration) {
             // Vibrate for 500ms.
             Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
-            vibrator.vibrate(500, new AudioAttributes.Builder()
-                    .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                    .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build());
+            vibrator.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
         }
     }
 
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index e5ddb87..ed89c6f 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -441,6 +441,8 @@
                         }
                         return false;
                     }
+
+                    return emergencyAlertEnabled;
                 }
             }
         }
@@ -497,8 +499,6 @@
 
         AlertType alertType = AlertType.CMAS_DEFAULT;
         if (message.isEtwsMessage()) {
-            // For ETWS, always vibrate, even in silent mode.
-            audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_VIBRATE_EXTRA, true);
             alertType = AlertType.ETWS_DEFAULT;
 
             if (message.getEtwsWarningInfo() != null) {
@@ -531,6 +531,8 @@
             }
         }
         audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_TONE_TYPE, alertType);
+        audioIntent.putExtra(CellBroadcastAlertAudio.ALERT_AUDIO_VIBRATE_EXTRA,
+                prefs.getBoolean(CellBroadcastSettings.KEY_ENABLE_ALERT_VIBRATE, true));
 
         String messageBody = message.getMessageBody();
 
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
index 19658f4..aca3526 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastChannelManager.java
@@ -28,11 +28,11 @@
  * carriers might enable through resources.
  * Syntax: "<channel id range>:[type=<alert type>], [emergency=true/false]"
  * For example,
- * <string-array name="carrier_additional_cbs_channels_strings" num="3">
- *     <item value="43008:type=earthquake" />
- *     <item value="0xAFEE:type=tsunami" />
- *     <item value="0xAC00-0xAFED:type=other" />
- *     <item value="1234-5678" />
+ * <string-array name="additional_cbs_channels_strings" translatable="false">
+ *     <item>"43008:type=earthquake, emergency=true"</item>
+ *     <item>"0xAFEE:type=tsunami, emergency=true"</item>
+ *     <item>"0xAC00-0xAFED:type=other"</item>
+ *     <item>"1234-5678"</item>
  * </string-array>
  * If no tones are specified, the alert type will be set to CMAS_DEFAULT. If emergency is not set,
  * by default it's not emergency.
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
index 477e8be..0120899 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
@@ -70,6 +70,7 @@
                     });
         } else if (TelephonyIntents.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED.equals(action)
                 || CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED.equals(action)
+                || Intent.ACTION_BOOT_COMPLETED.equals(action)
                 || CELLBROADCAST_START_CONFIG_ACTION.equals(action)) {
             // Todo: Add the service state check once the new get service state API is done.
             // Do not rely on mServiceState as it gets reset to -1 time to time because
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
index 702aef2..f26ec62 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSearchIndexableProvider.java
@@ -81,6 +81,11 @@
         Resources res = getContext().getResources();
         Object[] ref;
 
+        ref = new Object[1];
+        ref[COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE] =
+                CellBroadcastSettings.KEY_CATEGORY_DEV_SETTINGS;
+        cursor.addRow(ref);
+
         // Show alert settings and ETWS categories for ETWS builds and developer mode.
         if (!enableDevSettings) {
             // Remove general emergency alert preference items (not shown for CMAS builds).
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
index 393bafe..c47121b 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastSettings.java
@@ -17,6 +17,7 @@
 package com.android.cellbroadcastreceiver;
 
 import android.app.Activity;
+import android.app.Fragment;
 import android.app.backup.BackupManager;
 import android.content.Context;
 import android.content.Intent;
@@ -110,9 +111,12 @@
             return;
         }
 
-        // Display the fragment as the main content.
-        getFragmentManager().beginTransaction().replace(android.R.id.content,
-                new CellBroadcastSettingsFragment()).commit();
+        // We only add new CellBroadcastSettingsFragment if no fragment is restored.
+        Fragment fragment = getFragmentManager().findFragmentById(android.R.id.content);
+        if (fragment == null) {
+            getFragmentManager().beginTransaction().add(android.R.id.content,
+                    new CellBroadcastSettingsFragment()).commit();
+        }
     }
 
     /**
@@ -260,7 +264,7 @@
                     setAlertsEnabled(false);
                 }
             } else {
-                mAlertCategory.removePreference(mEmergencyCheckBox);
+                preferenceScreen.removePreference(mEmergencyCheckBox);
             }
 
             // Show alert settings and ETWS categories for ETWS builds and developer mode.
diff --git a/tests/testapp/res/values-bn/strings.xml b/tests/testapp/res/values-bn/strings.xml
index aff1b03..27ac7ca 100644
--- a/tests/testapp/res/values-bn/strings.xml
+++ b/tests/testapp/res/values-bn/strings.xml
@@ -43,6 +43,6 @@
     <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"ভাষা সহ GSM UCS-2 পাঠান"</string>
     <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"ভাষা সহ UMTS UCS-2 পাঠান"</string>
     <string name="button_delay_broadcast" msgid="751650250579017537">"পাঠানোর আগে ৫ সেকেন্ডের বিলম্ব"</string>
-    <string name="message_id_label" msgid="1445077194410403236">"বার্তা ID:"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"মেসেজ ID:"</string>
     <string name="category_id_label" msgid="6935815032327981691">"বিভাগ:"</string>
 </resources>
diff --git a/tests/testapp/res/values-bs/strings.xml b/tests/testapp/res/values-bs/strings.xml
index 592d5f9..130cd7c 100644
--- a/tests/testapp/res/values-bs/strings.xml
+++ b/tests/testapp/res/values-bs/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="app_label" msgid="2704349695846064655">"Testiranje Info servisa"</string>
+    <string name="app_label" msgid="2704349695846064655">"Testiranje info servisa"</string>
     <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Pošalji ETWS informaciju za zemljotres"</string>
     <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Pošalji ETWS informaciju za cunami"</string>
     <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Pošalji ETWS informaciju za zemljotres i cunami"</string>
diff --git a/tests/testapp/res/values-gl/strings.xml b/tests/testapp/res/values-gl/strings.xml
index 502cce7..c8cade3 100644
--- a/tests/testapp/res/values-gl/strings.xml
+++ b/tests/testapp/res/values-gl/strings.xml
@@ -20,7 +20,7 @@
     <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Enviar emisión de terremotos do ETWS"</string>
     <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Enviar emisión de tsunamis do ETWS"</string>
     <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Enviar emisión de terremotos e tsunamis do ETWS"</string>
-    <string name="button_etws_other_type" msgid="4129451610585426791">"Enviar difusión doutra emerxencia do ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Enviar difusión doutra urxencia do ETWS"</string>
     <string name="button_etws_cancel_type" msgid="4770911191572322801">"Enviar emisión de cancelación do ETWS"</string>
     <string name="button_etws_test_type" msgid="5520113823851979673">"Enviar emisión de proba do ETWS"</string>
     <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Enviar alerta presidencial de CMAS"</string>
diff --git a/tests/testapp/res/values-hi/strings.xml b/tests/testapp/res/values-hi/strings.xml
index 8638eb1..ae2ae8a 100644
--- a/tests/testapp/res/values-hi/strings.xml
+++ b/tests/testapp/res/values-hi/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="app_label" msgid="2704349695846064655">"सेल प्रसारण परीक्षण"</string>
+    <string name="app_label" msgid="2704349695846064655">"सेल ब्रॉडकास्ट (CBC) की जांच"</string>
     <string name="button_etws_earthquake_type" msgid="5391060421937195923">"ETWS भूकंप प्रसारण भेजें"</string>
     <string name="button_etws_tsunami_type" msgid="5866338269041475786">"ETWS सुनामी प्रसारण भेजें"</string>
     <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"ETWS भूकंप और सुनामी प्रसारण भेजें"</string>
diff --git a/tests/testapp/res/values-ko/strings.xml b/tests/testapp/res/values-ko/strings.xml
index e6103d0..0105898 100644
--- a/tests/testapp/res/values-ko/strings.xml
+++ b/tests/testapp/res/values-ko/strings.xml
@@ -23,7 +23,7 @@
     <string name="button_etws_other_type" msgid="4129451610585426791">"ETWS 기타 긴급 브로드캐스트 전송"</string>
     <string name="button_etws_cancel_type" msgid="4770911191572322801">"ETWS 취소 브로드캐스트 보내기"</string>
     <string name="button_etws_test_type" msgid="5520113823851979673">"ETWS 테스트 브로드캐스트 보내기"</string>
-    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"CMAS 대통령령 경보 보내기"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"CMAS 위급재난문자 보내기"</string>
     <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"CMAS 긴급 경보 보내기"</string>
     <string name="button_cmas_severe_alert" msgid="5197711586353552255">"CMAS 위험 경보 보내기"</string>
     <string name="button_cmas_amber_alert" msgid="860091654456014191">"CMAS 황색 경보 보내기"</string>
diff --git a/tests/testapp/res/values-pa/strings.xml b/tests/testapp/res/values-pa/strings.xml
index 3fc8cd1..2897f99 100644
--- a/tests/testapp/res/values-pa/strings.xml
+++ b/tests/testapp/res/values-pa/strings.xml
@@ -23,11 +23,11 @@
     <string name="button_etws_other_type" msgid="4129451610585426791">"ETWS ਹੋਰ ਐਮਰਜੈਂਸ਼ੀ ਪ੍ਰਸਾਰਣ ਭੇਜੋ"</string>
     <string name="button_etws_cancel_type" msgid="4770911191572322801">"ETWS ਰੱਦ ਕਰਨ ਦਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
     <string name="button_etws_test_type" msgid="5520113823851979673">"ETWS ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"CMAS Presidential ਚੇਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"CMAS Extreme ਚੇਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"CMAS Severe ਚੇਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_cmas_amber_alert" msgid="860091654456014191">"CMAS AMBER ਚੇਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS ਮਹੀਨਾਵਾਰ ਜਾਂਚ ਚੇਤਾਵਨੀ ਭੇਜੋ"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"CMAS Presidential  ਚਿਤਾਵਨੀ  ਭੇਜੋ"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"CMAS Extreme  ਚਿਤਾਵਨੀ  ਭੇਜੋ"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"CMAS Severe  ਚਿਤਾਵਨੀ  ਭੇਜੋ"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"CMAS AMBER  ਚਿਤਾਵਨੀ  ਭੇਜੋ"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS ਮਹੀਨਾਵਾਰ ਜਾਂਚ  ਚਿਤਾਵਨੀ  ਭੇਜੋ"</string>
     <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 Bit ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
     <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 Bit ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
     <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 Bit ਪੂਰੀ ਸਮਾਂ ਅਵਧੀ ਦਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
diff --git a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java
index 3884059..438ebef 100644
--- a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java
+++ b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java
@@ -77,11 +77,7 @@
                 SmsCbCmasInfo.CMAS_RESPONSE_TYPE_PREPARE, SmsCbCmasInfo.CMAS_SEVERITY_EXTREME,
                 SmsCbCmasInfo.CMAS_URGENCY_EXPECTED, SmsCbCmasInfo.CMAS_CERTAINTY_OBSERVED);
 
-        Intent intent = new Intent(Telephony.Sms.Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
-        intent.putExtra("message", cbMessage);
-        activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
-                Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
-                AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
+        sendBroadcast(activity, cbMessage);
     }
 
     public static void testSendCmasSevereAlert(Activity activity, int messageId) {
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 7940591..6198739 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -22,9 +22,13 @@
 LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android-support-test \
-    mockito-target-minus-junit4 \
-    legacy-android-test
+        android-support-test \
+        espresso-core \
+        legacy-android-test \
+        mockito-target-minus-junit4 \
+        truth-prebuilt \
+        ub-uiautomator
+
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastSettingsTest.java b/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastSettingsTest.java
new file mode 100644
index 0000000..e4ea05f
--- /dev/null
+++ b/tests/unit/src/com/android/cellbroadcastreceiver/CellBroadcastSettingsTest.java
@@ -0,0 +1,74 @@
+/**
+ * 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.
+ */
+package com.android.cellbroadcastreceiver;
+
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.action.ViewActions.click;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.support.test.uiautomator.UiDevice;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CellBroadcastSettingsTest {
+    private Instrumentation mInstrumentation;
+    private Context mContext;
+    private UiDevice mDevice;
+
+    @Before
+    public void setUp() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = mInstrumentation.getTargetContext();
+        mDevice = UiDevice.getInstance(mInstrumentation);
+    }
+
+    @Test
+    public void testRotate_alertReminderDialogOpen_shouldNotCrash() {
+        mInstrumentation.startActivitySync(createActivityIntent());
+
+        openAlertReminderDialog();
+
+        try {
+            mDevice.setOrientationLeft();
+            mDevice.setOrientationNatural();
+            mDevice.setOrientationRight();
+        } catch (Exception e) {
+            Assert.fail("Exception " + e);
+        }
+    }
+
+    private Intent createActivityIntent() {
+        Intent intent = new Intent(mContext, CellBroadcastSettings.class);
+        intent.setPackage("com.android.cellbroadcastreceiver");
+        intent.setAction("android.intent.action.MAIN");
+        return intent;
+    }
+
+    private void openAlertReminderDialog() {
+        onView(withText(mContext.getString(R.string.alert_reminder_interval_title)))
+                .perform(click());
+    }
+}