Merge "Set focus to the button" am: adc84e8f3d am: d066f138dc
am: 777f151592

Change-Id: Iec26d46071ad23b3efc64426462e9ee36d74e89b
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 56e7436..25dc882 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -108,6 +108,7 @@
                 <action android:name="android.provider.Telephony.SMS_CB_RECEIVED" />
                 <action android:name="android.cellbroadcastreceiver.START_CONFIG" />
                 <action android:name="android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED" />
+                <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
         </receiver>
 
@@ -121,7 +122,7 @@
 
         <receiver android:name="CellBroadcastReceiver">
             <intent-filter>
-                 <action android:name="android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED" />
+                 <action android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED" />
                  <action android:name="android.telephony.action.CARRIER_CONFIG_CHANGED" />
             </intent-filter>
         </receiver>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 740449c..813af60 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Een keer"</item>
     <item msgid="9097229303902157183">"Elke 2 minute"</item>
-    <item msgid="5676933700148002666">"Elke 15 minute"</item>
-    <item msgid="694355015442188708">"Af"</item>
+    <item msgid="5718214950343391480">"Elke 5 minute"</item>
+    <item msgid="3863339891188103437">"Elke 15 minute"</item>
+    <item msgid="6868848414437854609">"Af"</item>
   </string-array>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0a540bb..337a91c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"አንዴ"</item>
     <item msgid="9097229303902157183">"በየ2 ደቂቃዎች"</item>
-    <item msgid="5676933700148002666">"በየ15 ደቂቃዎች"</item>
-    <item msgid="694355015442188708">"ጠፍቷል"</item>
+    <item msgid="5718214950343391480">"በየ5 ደቂቃው"</item>
+    <item msgid="3863339891188103437">"በየ15 ደቂቃው"</item>
+    <item msgid="6868848414437854609">"ጠፍቷል"</item>
   </string-array>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index eb27ab6..ad43935 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"مرة واحدة"</item>
     <item msgid="9097229303902157183">"كل دقيقتين"</item>
-    <item msgid="5676933700148002666">"كل 15 دقيقة"</item>
-    <item msgid="694355015442188708">"إيقاف"</item>
+    <item msgid="5718214950343391480">"كل ٥ دقائق"</item>
+    <item msgid="3863339891188103437">"كل ١٥ دقيقة"</item>
+    <item msgid="6868848414437854609">"إيقاف"</item>
   </string-array>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 98%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
index 0072a2d..3739aef 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Bir dəfə"</item>
     <item msgid="9097229303902157183">"Hər 2 dəqiqə"</item>
-    <item msgid="5676933700148002666">"Hər 15 dəqiqə"</item>
-    <item msgid="694355015442188708">"Deaktiv"</item>
+    <item msgid="5718214950343391480">"5 dəqiqədən bir"</item>
+    <item msgid="3863339891188103437">"Hər 15 dəqiqə"</item>
+    <item msgid="6868848414437854609">"Deaktiv"</item>
   </string-array>
 </resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 25c16ae..6d64b9c 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -77,7 +77,7 @@
     <string name="cmas_category_fire" msgid="3331981591918341119">"Požar"</string>
     <string name="cmas_category_health" msgid="312569774587117324">"Zdravstvena"</string>
     <string name="cmas_category_env" msgid="9213088574227522961">"Ekološka"</string>
-    <string name="cmas_category_transport" msgid="5014901635987361642">"Transport"</string>
+    <string name="cmas_category_transport" msgid="5014901635987361642">"Prevoz"</string>
     <string name="cmas_category_infra" msgid="3558151044446851398">"Infrastruktura"</string>
     <string name="cmas_category_cbrne" msgid="240421557913603971">"Hemijska/biološka/nuklearna/eksplozivna"</string>
     <string name="cmas_category_other" msgid="6158932360790744360">"Drugo"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jedanput"</item>
     <item msgid="9097229303902157183">"Svaka 2 minuta"</item>
-    <item msgid="5676933700148002666">"Svakih 15 minuta"</item>
-    <item msgid="694355015442188708">"Isključeno"</item>
+    <item msgid="5718214950343391480">"Svakih 5 minuta"</item>
+    <item msgid="3863339891188103437">"Svakih 15 minuta"</item>
+    <item msgid="6868848414437854609">"Isključeno"</item>
   </string-array>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
new file mode 100644
index 0000000..fc2c234
--- /dev/null
+++ b/res/values-be/strings.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="7559008249836700599">"Мабільныя вяшчанні"</string>
+    <string name="sms_cb_settings" msgid="971917159442705371">"Настройкі мабільнага вяшчання"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Налады мабільнага вяшчання недаступныя для гэтага карыстальніка"</string>
+    <string name="button_dismiss" msgid="1234221657930516287">"ОК"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Няма актыўных абвестак у вашым раёне. Вы можаце змяніць налады абвестак, выкарыстоўваючы меню налад."</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Настройкі"</string>
+    <string name="menu_delete_all" msgid="3940997343921149800">"Выдаліць вяшчаннi"</string>
+    <string name="message_options" msgid="3178489901903589574">"Параметры паведамлення"</string>
+    <string name="menu_view_details" msgid="1040989019045280975">"Прагледзець звесткі"</string>
+    <string name="menu_delete" msgid="128380070910799366">"Выдаліць вяшчанне"</string>
+    <string name="view_details_title" msgid="1780427629491781473">"Iнфармацыя пра абвестку"</string>
+    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Выдаліць гэту трансляцыю?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Выдаліць усе атрыманыя паведамленні трансляцыi?"</string>
+    <string name="button_delete" msgid="4672451757925194350">"Выдаліць"</string>
+    <string name="button_cancel" msgid="7479958360523246140">"Скасаваць"</string>
+    <string name="etws_earthquake_warning" msgid="6428741104423152511">"Папярэджанне пра землятрус"</string>
+    <string name="etws_tsunami_warning" msgid="6173964105145900312">"Папярэджанне пра цунамі"</string>
+    <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Папярэджанне пра землятрус і цунамі"</string>
+    <string name="etws_test_message" msgid="8447820262584381894">"Паведамленне выпрабавання ETWS"</string>
+    <string name="etws_other_emergency_type" msgid="5233080551309721499">"Папярэджанні пра надзвычайныя сітуацыi"</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">"Штомесячны тэст аварыйнай абвесткi"</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="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="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="enable_alert_vibrate_title" msgid="982817538757982090">"Вібрацыя"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4328060563316778589">"Вібрацыя падчас атрымання абвесткi"</string>
+    <string name="category_brazil_settings_title" msgid="6343130548572319922">"Настройкі для Бразіліі"</string>
+    <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Паказаць вяшчанне канала 50"</string>
+    <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Канал 50 выкарыстоўваецца ў Бразіліі для абнаўлення інфармацыі вобласці"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Параметры распрацоўшчыка"</string>
+    <string name="cmas_category_heading" msgid="3923503130776640717">"Катэгорыя абвесткi:"</string>
+    <string name="cmas_category_geo" msgid="4979494217069688527">"Геафізічная небяспека"</string>
+    <string name="cmas_category_met" msgid="7563732573851773537">"Метэаралагічная небяспека"</string>
+    <string name="cmas_category_safety" msgid="2986472639641883453">"Бяспека"</string>
+    <string name="cmas_category_security" msgid="2549520159044403704">"Бяспека"</string>
+    <string name="cmas_category_rescue" msgid="4907571719983321086">"Выратавальныя небяспекі"</string>
+    <string name="cmas_category_fire" msgid="3331981591918341119">"Пажарная небяспека"</string>
+    <string name="cmas_category_health" msgid="312569774587117324">"Здароўе"</string>
+    <string name="cmas_category_env" msgid="9213088574227522961">"Небяспека для навакольнага асяроддзя"</string>
+    <string name="cmas_category_transport" msgid="5014901635987361642">"Транспарціроўка"</string>
+    <string name="cmas_category_infra" msgid="3558151044446851398">"Інфраструктура"</string>
+    <string name="cmas_category_cbrne" msgid="240421557913603971">"Хімічная/біялагічная/ядзерная/выбуховая небяспека"</string>
+    <string name="cmas_category_other" msgid="6158932360790744360">"Іншыя небяспекі"</string>
+    <string name="cmas_response_heading" msgid="4205379547245540163">"Тып рэагавання:"</string>
+    <string name="cmas_response_shelter" msgid="7301175579079615909">"Прытулак"</string>
+    <string name="cmas_response_evacuate" msgid="5833170084430021095">"Эвакуіраваць"</string>
+    <string name="cmas_response_prepare" msgid="8428073909753758319">"Рыхтавацца"</string>
+    <string name="cmas_response_execute" msgid="284719420769568493">"Выканаць"</string>
+    <string name="cmas_response_monitor" msgid="681400164440495749">"Манітор"</string>
+    <string name="cmas_response_avoid" msgid="156419597612629270">"Пазбегнуць"</string>
+    <string name="cmas_response_assess" msgid="9043534222710563415">"Ацэнка"</string>
+    <string name="cmas_response_none" msgid="5149009359674452959">"Няма"</string>
+    <string name="cmas_severity_heading" msgid="8437057117822305243">"Цяжкасць:"</string>
+    <string name="cmas_severity_extreme" msgid="1312013282860183082">"Крайнія"</string>
+    <string name="cmas_severity_severe" msgid="7504359209737074524">"Сур\'ёзныя"</string>
+    <string name="cmas_urgency_heading" msgid="8218282767913431492">"Тэрміновасць:"</string>
+    <string name="cmas_urgency_immediate" msgid="1577485208196449288">"Неадкладна"</string>
+    <string name="cmas_urgency_expected" msgid="6830831119872375936">"Чаканае"</string>
+    <string name="cmas_certainty_heading" msgid="8374669249736439193">"Надзейнасць:"</string>
+    <string name="cmas_certainty_observed" msgid="3668549749352106472">"Назіраныя"</string>
+    <string name="cmas_certainty_likely" msgid="4254497828943291749">"Верагодныя"</string>
+    <string name="delivery_time_heading" msgid="5980836543433619329">"Атрымана:"</string>
+    <string name="notification_multiple" msgid="5121978148152124860">"Непрачытаных абвестак: <xliff:g id="COUNT">%s</xliff:g>."</string>
+    <string name="notification_multiple_title" msgid="1523638925739947855">"Новыя абвесткі"</string>
+    <string name="show_cmas_opt_out_summary" msgid="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-array name="alert_reminder_interval_entries">
+    <item msgid="6595211083588795160">"Адзiн раз"</item>
+    <item msgid="9097229303902157183">"Кожныя 2 хвіліны"</item>
+    <item msgid="5718214950343391480">"Кожныя 5 хвілін"</item>
+    <item msgid="3863339891188103437">"Кожныя 15 хвілін"</item>
+    <item msgid="6868848414437854609">"Выключана"</item>
+  </string-array>
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a3bf054..79f4ec3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Веднъж"</item>
     <item msgid="9097229303902157183">"На всеки 2 минути"</item>
-    <item msgid="5676933700148002666">"На всеки 15 минути"</item>
-    <item msgid="694355015442188708">"Изключено"</item>
+    <item msgid="5718214950343391480">"На всеки 5 минути"</item>
+    <item msgid="3863339891188103437">"На всеки 15 минути"</item>
+    <item msgid="6868848414437854609">"Изключено"</item>
   </string-array>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
similarity index 98%
rename from res/values-bn-rBD/strings.xml
rename to res/values-bn/strings.xml
index 033d626..fcbb0fd 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"একবার"</item>
     <item msgid="9097229303902157183">"প্রতি ২ মিনিট"</item>
-    <item msgid="5676933700148002666">"প্রতি ১৫ মিনিটে"</item>
-    <item msgid="694355015442188708">"বন্ধ করুন"</item>
+    <item msgid="5718214950343391480">"প্রতি ৫ মিনিট"</item>
+    <item msgid="3863339891188103437">"প্রতি ১৫ মিনিট"</item>
+    <item msgid="6868848414437854609">"বন্ধ আছে"</item>
   </string-array>
 </resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs/strings.xml
similarity index 85%
rename from res/values-bs-rBA/strings.xml
rename to res/values-bs/strings.xml
index 7cc219a..9efeb4f 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs/strings.xml
@@ -16,19 +16,19 @@
 
 <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 servisi"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Postavke mobilnih emisija"</string>
+    <string name="app_label" msgid="7559008249836700599">"Info servis"</string>
+    <string name="sms_cb_settings" msgid="971917159442705371">"Postavke Info servisa"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Postavke info servisa nisu dostupne ovom korisniku"</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. Možete promijeniti postavke upozorenja pomoću opcije izbornika Postavke."</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>
     <string name="menu_preferences" msgid="3596514894131599202">"Postavke"</string>
-    <string name="menu_delete_all" msgid="3940997343921149800">"Izbriši emisije"</string>
+    <string name="menu_delete_all" msgid="3940997343921149800">"Izbriši informacije"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcije za poruke"</string>
-    <string name="menu_view_details" msgid="1040989019045280975">"Pogledajte detalje"</string>
-    <string name="menu_delete" msgid="128380070910799366">"Izbriši emisiju"</string>
+    <string name="menu_view_details" msgid="1040989019045280975">"Prikaži detalje"</string>
+    <string name="menu_delete" msgid="128380070910799366">"Izbriši informaciju"</string>
     <string name="view_details_title" msgid="1780427629491781473">"Detalji o upozorenjima"</string>
-    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Izbrisati ovu emisiju?"</string>
-    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Izbrisati sve primljene emitovane poruke?"</string>
+    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Izbrisati ovu informaciju?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Izbrisati sve primljene informacije?"</string>
     <string name="button_delete" msgid="4672451757925194350">"Izbriši"</string>
     <string name="button_cancel" msgid="7479958360523246140">"Otkaži"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"Upozorenje na zemljotres"</string>
@@ -52,65 +52,66 @@
     <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">"Pokaži ETWS testne emisije"</string>
-    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Prikaži testne emisije za sistem upozoravanja na zemljotres i cunami"</string>
+    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Pokaži ETWS testne informacije."</string>
+    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Prikaži testne informacije iz sistema upozoravanja na zemljotres i cunami (ETWS)"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Pokaži ekstremne prijetnje"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Prikaži upozorenja za ekstremne prijetnje po život i imovinu"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Pokaži ozbiljne prijetnje"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Prikaži upozorenja za ozbiljne prijetnje po život i imovinu"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Pokaži AMBER upozorenja"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Prikaži uputstvo za ponašanje u slučaju otmice djeteta (AMBER upozorenje)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Pokaži CMAS testne emisije"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Prikaži testne emisije za komercijalne mobilne sisteme uzbunjivanja"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Pokaži CMAS testne informacije"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Prikaži testne informacije iz komercijalnih mobilnih sistema uzbunjivanja (CMAS)"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibriraj"</string>
     <string name="enable_alert_vibrate_summary" msgid="4328060563316778589">"Vibracija za upozorenje"</string>
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Postavke za Brazil"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Pokaži emisije kanala 50"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Kanal 50 se koristi u Brazilu za redovno informisanje područja"</string>
+    <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Pokaži informacije s kanala 50"</string>
+    <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Kanal 50 se koristi u Brazilu za informacije o događajima u okolini"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcije za programere"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategorija upozorenja:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizičko"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorološko"</string>
     <string name="cmas_category_safety" msgid="2986472639641883453">"Sigurnost"</string>
-    <string name="cmas_category_security" msgid="2549520159044403704">"Bezbjednost"</string>
-    <string name="cmas_category_rescue" msgid="4907571719983321086">"Spasavanje"</string>
-    <string name="cmas_category_fire" msgid="3331981591918341119">"Požar"</string>
+    <string name="cmas_category_security" msgid="2549520159044403704">"Zaštita"</string>
+    <string name="cmas_category_rescue" msgid="4907571719983321086">"Spašavanje"</string>
+    <string name="cmas_category_fire" msgid="3331981591918341119">"Požarno"</string>
     <string name="cmas_category_health" msgid="312569774587117324">"Zdravstveno"</string>
     <string name="cmas_category_env" msgid="9213088574227522961">"Ekološko"</string>
     <string name="cmas_category_transport" msgid="5014901635987361642">"Transport"</string>
     <string name="cmas_category_infra" msgid="3558151044446851398">"Infrastrukturno"</string>
-    <string name="cmas_category_cbrne" msgid="240421557913603971">"Hemijsko/Biološko/Nuklearno/Eksploziv"</string>
+    <string name="cmas_category_cbrne" msgid="240421557913603971">"Hemijsko/biološko/nuklearno/eksplozivno"</string>
     <string name="cmas_category_other" msgid="6158932360790744360">"Ostalo"</string>
     <string name="cmas_response_heading" msgid="4205379547245540163">"Tip odgovora:"</string>
-    <string name="cmas_response_shelter" msgid="7301175579079615909">"Sklonište"</string>
+    <string name="cmas_response_shelter" msgid="7301175579079615909">"Pronađi sklonište"</string>
     <string name="cmas_response_evacuate" msgid="5833170084430021095">"Evakuiši se"</string>
     <string name="cmas_response_prepare" msgid="8428073909753758319">"Pripremi se"</string>
     <string name="cmas_response_execute" msgid="284719420769568493">"Izvrši"</string>
     <string name="cmas_response_monitor" msgid="681400164440495749">"Prati situaciju"</string>
-    <string name="cmas_response_avoid" msgid="156419597612629270">"Izbjegavati"</string>
+    <string name="cmas_response_avoid" msgid="156419597612629270">"Izbjegavaj"</string>
     <string name="cmas_response_assess" msgid="9043534222710563415">"Procijeni"</string>
-    <string name="cmas_response_none" msgid="5149009359674452959">"Nema aktivnosti"</string>
+    <string name="cmas_response_none" msgid="5149009359674452959">"Ne poduzimaj ništa"</string>
     <string name="cmas_severity_heading" msgid="8437057117822305243">"Ozbiljnost:"</string>
     <string name="cmas_severity_extreme" msgid="1312013282860183082">"Ekstremna"</string>
     <string name="cmas_severity_severe" msgid="7504359209737074524">"Teška"</string>
     <string name="cmas_urgency_heading" msgid="8218282767913431492">"Hitnost:"</string>
     <string name="cmas_urgency_immediate" msgid="1577485208196449288">"Neposredna"</string>
     <string name="cmas_urgency_expected" msgid="6830831119872375936">"Očekivana"</string>
-    <string name="cmas_certainty_heading" msgid="8374669249736439193">"Sigurnost:"</string>
+    <string name="cmas_certainty_heading" msgid="8374669249736439193">"Stepen vjerovatnoće:"</string>
     <string name="cmas_certainty_observed" msgid="3668549749352106472">"Uočeno"</string>
     <string name="cmas_certainty_likely" msgid="4254497828943291749">"Vjerovatno"</string>
     <string name="delivery_time_heading" msgid="5980836543433619329">"Primljeno:"</string>
-    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> nepročitanih upozorenja."</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 dijalog za odjavljivanje nakon prikazivanja prvog CMAS upozorenja (osim predsjedničkog upozorenja)."</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Prikaži dijalog za odjavljivanje"</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="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-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jednom"</item>
     <item msgid="9097229303902157183">"Svake 2 minute"</item>
-    <item msgid="5676933700148002666">"Svakih 15 minuta"</item>
-    <item msgid="694355015442188708">"Isključeno"</item>
+    <item msgid="5718214950343391480">"Svakih 5 minuta"</item>
+    <item msgid="3863339891188103437">"Svakih 15 minuta"</item>
+    <item msgid="6868848414437854609">"Isključeno"</item>
   </string-array>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3749ad8..b7dae9a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -16,8 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="7559008249836700599">"Difusions de cel·la"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"Configuració de difusió de cel·la"</string>
+    <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="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 l\'opció del menú de configuració."</string>
@@ -44,7 +44,7 @@
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Alerta d\'emergències (exercici)"</string>
     <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="7083176204482365281">"Difusió de cel·la"</string>
+    <string name="cb_other_message_identifiers" msgid="7083176204482365281">"Difusió mòbil"</string>
     <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Configuració de l\'alerta d\'emergències"</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\'alerta d\'emergències"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Una vegada"</item>
     <item msgid="9097229303902157183">"Cada 2 minuts"</item>
-    <item msgid="5676933700148002666">"Cada 15 minuts"</item>
-    <item msgid="694355015442188708">"Desactivat"</item>
+    <item msgid="5718214950343391480">"Cada 5 minuts"</item>
+    <item msgid="3863339891188103437">"Cada 15 minuts"</item>
+    <item msgid="6868848414437854609">"Desactivats"</item>
   </string-array>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index c16df83..496abfc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -39,7 +39,7 @@
     <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Prezidentská výstraha"</string>
     <string name="cmas_extreme_alert" msgid="2588720613319969289">"Nouzová výstraha: Extrémní"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"Nouzová výstraha: Závažná"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"Únos dítěte (upozornění systému Amber)"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"Únos dítěte (upozornění Amber)"</string>
     <string name="cmas_required_monthly_test" msgid="6464047268150108932">"Měsíční test nouzové výstrahy"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Nouzová výstraha (cvičení)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Nouzová výstraha (operátor)"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jednou"</item>
     <item msgid="9097229303902157183">"Každé 2 minuty"</item>
-    <item msgid="5676933700148002666">"Každých 15 minut"</item>
-    <item msgid="694355015442188708">"Vypnuto"</item>
+    <item msgid="5718214950343391480">"Každých 5 minut"</item>
+    <item msgid="3863339891188103437">"Každých 15 minut"</item>
+    <item msgid="6868848414437854609">"Vypnuto"</item>
   </string-array>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ede6ff3..df26427 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Én gang"</item>
     <item msgid="9097229303902157183">"Hvert andet minut"</item>
-    <item msgid="5676933700148002666">"Hvert 15. minut"</item>
-    <item msgid="694355015442188708">"Fra"</item>
+    <item msgid="5718214950343391480">"Hvert 5. minut"</item>
+    <item msgid="3863339891188103437">"Hvert 15. minut"</item>
+    <item msgid="6868848414437854609">"Fra"</item>
   </string-array>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 744ec04..bca70ce 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Einmal"</item>
     <item msgid="9097229303902157183">"Alle 2 Minuten"</item>
-    <item msgid="5676933700148002666">"Alle 15 Minuten"</item>
-    <item msgid="694355015442188708">"Deaktiviert"</item>
+    <item msgid="5718214950343391480">"Alle 5 Minuten"</item>
+    <item msgid="3863339891188103437">"Alle 15 Minuten"</item>
+    <item msgid="6868848414437854609">"Aus"</item>
   </string-array>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 04191ab..345dad9 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Μία φορά"</item>
     <item msgid="9097229303902157183">"Κάθε 2 λεπτά"</item>
-    <item msgid="5676933700148002666">"Κάθε 15 λεπτά"</item>
-    <item msgid="694355015442188708">"Απενεργοποίηση"</item>
+    <item msgid="5718214950343391480">"Κάθε 5 λεπτά"</item>
+    <item msgid="3863339891188103437">"Κάθε 15 λεπτά"</item>
+    <item msgid="6868848414437854609">"Απενεργοποιημένη"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 8b96456..f40a2cf 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Once"</item>
     <item msgid="9097229303902157183">"Every 2 minutes"</item>
-    <item msgid="5676933700148002666">"Every 15 minutes"</item>
-    <item msgid="694355015442188708">"Off"</item>
+    <item msgid="5718214950343391480">"Every 5 minutes"</item>
+    <item msgid="3863339891188103437">"Every 15 minutes"</item>
+    <item msgid="6868848414437854609">"Off"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 8b96456..f40a2cf 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Once"</item>
     <item msgid="9097229303902157183">"Every 2 minutes"</item>
-    <item msgid="5676933700148002666">"Every 15 minutes"</item>
-    <item msgid="694355015442188708">"Off"</item>
+    <item msgid="5718214950343391480">"Every 5 minutes"</item>
+    <item msgid="3863339891188103437">"Every 15 minutes"</item>
+    <item msgid="6868848414437854609">"Off"</item>
   </string-array>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 8b96456..f40a2cf 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Once"</item>
     <item msgid="9097229303902157183">"Every 2 minutes"</item>
-    <item msgid="5676933700148002666">"Every 15 minutes"</item>
-    <item msgid="694355015442188708">"Off"</item>
+    <item msgid="5718214950343391480">"Every 5 minutes"</item>
+    <item msgid="3863339891188103437">"Every 15 minutes"</item>
+    <item msgid="6868848414437854609">"Off"</item>
   </string-array>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f9808e3..1bac978 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Una vez"</item>
     <item msgid="9097229303902157183">"Cada 2 minutos"</item>
-    <item msgid="5676933700148002666">"Cada 15 minutos"</item>
-    <item msgid="694355015442188708">"Apagado"</item>
+    <item msgid="5718214950343391480">"Cada 5 minutos"</item>
+    <item msgid="3863339891188103437">"Cada 15 minutos"</item>
+    <item msgid="6868848414437854609">"Desactivado"</item>
   </string-array>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3cb8f84..d369beb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Una vez"</item>
     <item msgid="9097229303902157183">"Cada 2 minutos"</item>
-    <item msgid="5676933700148002666">"Cada 15 minutos"</item>
-    <item msgid="694355015442188708">"No"</item>
+    <item msgid="5718214950343391480">"Cada 5 minutos"</item>
+    <item msgid="3863339891188103437">"Cada 15 minutos"</item>
+    <item msgid="6868848414437854609">"Desactivado"</item>
   </string-array>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 98%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
index 19f2477..8053bbd 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Üks kord"</item>
     <item msgid="9097229303902157183">"Iga 2 minuti järel"</item>
-    <item msgid="5676933700148002666">"Iga 15 minuti järel"</item>
-    <item msgid="694355015442188708">"Väljas"</item>
+    <item msgid="5718214950343391480">"Iga 5 minuti järel"</item>
+    <item msgid="3863339891188103437">"Iga 15 minuti järel"</item>
+    <item msgid="6868848414437854609">"Väljas"</item>
   </string-array>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 98%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
index d172cc9..26dc90f 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Behin"</item>
     <item msgid="9097229303902157183">"2 minutuz behin"</item>
-    <item msgid="5676933700148002666">"15 minutuz behin"</item>
-    <item msgid="694355015442188708">"Desaktibatuta"</item>
+    <item msgid="5718214950343391480">"5 minutuz behin"</item>
+    <item msgid="3863339891188103437">"15 minutuz behin"</item>
+    <item msgid="6868848414437854609">"Desaktibatuta"</item>
   </string-array>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2b1318a..c8fde10 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"تنظیمات پخش سلولی"</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>
@@ -77,7 +77,7 @@
     <string name="cmas_category_fire" msgid="3331981591918341119">"آتش"</string>
     <string name="cmas_category_health" msgid="312569774587117324">"بهداشت"</string>
     <string name="cmas_category_env" msgid="9213088574227522961">"زیست محیطی"</string>
-    <string name="cmas_category_transport" msgid="5014901635987361642">"حمل و نقل"</string>
+    <string name="cmas_category_transport" msgid="5014901635987361642">"حمل‌ونقل"</string>
     <string name="cmas_category_infra" msgid="3558151044446851398">"زیرساخت"</string>
     <string name="cmas_category_cbrne" msgid="240421557913603971">"شیمیایی/بیولوژیکی/هسته‌ای/انفجاری"</string>
     <string name="cmas_category_other" msgid="6158932360790744360">"موارد دیگر"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"یک بار"</item>
     <item msgid="9097229303902157183">"هر ۲ دقیقه"</item>
-    <item msgid="5676933700148002666">"هر ۱۵ دقیقه"</item>
-    <item msgid="694355015442188708">"خاموش"</item>
+    <item msgid="5718214950343391480">"هر ۵ دقیقه"</item>
+    <item msgid="3863339891188103437">"هر ۱۵ دقیقه"</item>
+    <item msgid="6868848414437854609">"خاموش"</item>
   </string-array>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1ebd49c..736412d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Kerran"</item>
     <item msgid="9097229303902157183">"Kahden minuutin välein"</item>
-    <item msgid="5676933700148002666">"15 minuutin välein"</item>
-    <item msgid="694355015442188708">"Pois"</item>
+    <item msgid="5718214950343391480">"5 minuutin välein"</item>
+    <item msgid="3863339891188103437">"15 minuutin välein"</item>
+    <item msgid="6868848414437854609">"Pois käytöstä"</item>
   </string-array>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index f96d5a9..8b798c2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"Paramètres de diffusion cellulaire"</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>
+    <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>
     <string name="menu_preferences" msgid="3596514894131599202">"Paramètres"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Supprimer les diffusions"</string>
     <string name="message_options" msgid="3178489901903589574">"Options relatives aux messages"</string>
@@ -39,7 +39,7 @@
     <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Alerte présidentielle"</string>
     <string name="cmas_extreme_alert" msgid="2588720613319969289">"Alerte d\'urgence : extrême"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"Alerte d\'urgence : grave"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"Enlèvement d\'enfants (alerte AMBER)"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"Enlèvement enfant (alerte Amber)"</string>
     <string name="cmas_required_monthly_test" msgid="6464047268150108932">"Test mensuel d\'alerte d\'urgence"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Alerte d\'urgence (exercice)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alerte d\'urgence (opérateur)"</string>
@@ -67,7 +67,7 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Paramètres pour le Brésil"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Afficher diffusions chaîne 50"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Au Brésil, les dernières informations locales sont diffusées sur la chaîne 50."</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Options pour les développeurs"</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>
     <string name="cmas_category_met" msgid="7563732573851773537">"Météorologie"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Une fois"</item>
     <item msgid="9097229303902157183">"Toutes les 2 minutes"</item>
-    <item msgid="5676933700148002666">"Toutes les 15 minutes"</item>
-    <item msgid="694355015442188708">"Désactivé"</item>
+    <item msgid="5718214950343391480">"Toutes les 5 minutes"</item>
+    <item msgid="3863339891188103437">"Toutes les 15 minutes"</item>
+    <item msgid="6868848414437854609">"Désactivé"</item>
   </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c7eeffe..e2096c0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Une fois"</item>
     <item msgid="9097229303902157183">"Toutes les 2 minutes"</item>
-    <item msgid="5676933700148002666">"Toutes les 15 minutes"</item>
-    <item msgid="694355015442188708">"Désactivé"</item>
+    <item msgid="5718214950343391480">"Toutes les 5 minutes"</item>
+    <item msgid="3863339891188103437">"Toutes les 15 minutes"</item>
+    <item msgid="6868848414437854609">"Désactivé"</item>
   </string-array>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 96%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
index e5071f8..c3eb12e 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="7559008249836700599">"Difusións de cela"</string>
+    <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="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ú de Configuración."</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>
     <string name="menu_preferences" msgid="3596514894131599202">"Configuración"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Eliminar emisións"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcións das mensaxes"</string>
@@ -71,8 +71,8 @@
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoría de alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Xeofísicas"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorolóxicas"</string>
-    <string name="cmas_category_safety" msgid="2986472639641883453">"Seguridade"</string>
-    <string name="cmas_category_security" msgid="2549520159044403704">"Seguridade"</string>
+    <string name="cmas_category_safety" msgid="2986472639641883453">"Seguranza"</string>
+    <string name="cmas_category_security" msgid="2549520159044403704">"Seguranza"</string>
     <string name="cmas_category_rescue" msgid="4907571719983321086">"Rescate"</string>
     <string name="cmas_category_fire" msgid="3331981591918341119">"Lume"</string>
     <string name="cmas_category_health" msgid="312569774587117324">"Saúde"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Unha vez"</item>
     <item msgid="9097229303902157183">"Cada 2 minutos"</item>
-    <item msgid="5676933700148002666">"Cada 15 minutos"</item>
-    <item msgid="694355015442188708">"Desactivado"</item>
+    <item msgid="5718214950343391480">"Cada 5 minutos"</item>
+    <item msgid="3863339891188103437">"Cada 15 minutos"</item>
+    <item msgid="6868848414437854609">"Desactivado"</item>
   </string-array>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml
similarity index 98%
rename from res/values-gu-rIN/strings.xml
rename to res/values-gu/strings.xml
index 13924dc..1be9e8b 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu/strings.xml
@@ -19,7 +19,7 @@
     <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="button_dismiss" msgid="1234221657930516287">"ઑકે"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"એકવાર"</item>
     <item msgid="9097229303902157183">"દર 2 મિનિટે"</item>
-    <item msgid="5676933700148002666">"દર 15 મિનિટે"</item>
-    <item msgid="694355015442188708">"બંધ"</item>
+    <item msgid="5718214950343391480">"દર 5 મિનિટે"</item>
+    <item msgid="3863339891188103437">"દર 15 મિનિટે"</item>
+    <item msgid="6868848414437854609">"બંધ"</item>
   </string-array>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2429197..f17d199 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"एक बार"</item>
     <item msgid="9097229303902157183">"प्रत्येक 2 मिनट में"</item>
-    <item msgid="5676933700148002666">"प्रत्‍येक 15 मिनट में"</item>
-    <item msgid="694355015442188708">"बंद"</item>
+    <item msgid="5718214950343391480">"प्रत्‍येक 5 मिनट"</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 06aa76d..ac955b0 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="7559008249836700599">"Emitiranja na mobitele"</string>
+    <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="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. Možete promijeniti postavke upozorenja pomoću opcije izbornika Postavke."</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>
     <string name="menu_preferences" msgid="3596514894131599202">"Postavke"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Izbriši emitiranja"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcije poruka"</string>
@@ -44,7 +44,7 @@
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Hitno upozorenje (vježba)"</string>
     <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="7083176204482365281">"Emitiranje na mobitele"</string>
+    <string name="cb_other_message_identifiers" msgid="7083176204482365281">"Poruke mobilne mreže"</string>
     <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Postavke hitnih upozorenja"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jedanput"</item>
     <item msgid="9097229303902157183">"Svake 2 minute"</item>
-    <item msgid="5676933700148002666">"Svakih 15 minuta"</item>
-    <item msgid="694355015442188708">"Isključeno"</item>
+    <item msgid="5718214950343391480">"Svakih 5 minuta"</item>
+    <item msgid="3863339891188103437">"Svakih 15 minuta"</item>
+    <item msgid="6868848414437854609">"Isključeno"</item>
   </string-array>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b02fae6..c962093 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Egyszer"</item>
     <item msgid="9097229303902157183">"2 percenként"</item>
-    <item msgid="5676933700148002666">"15 percenként"</item>
-    <item msgid="694355015442188708">"Kikapcsolva"</item>
+    <item msgid="5718214950343391480">"5 percenként"</item>
+    <item msgid="3863339891188103437">"15 percenként"</item>
+    <item msgid="6868848414437854609">"Kikapcsolva"</item>
   </string-array>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml
similarity index 97%
rename from res/values-hy-rAM/strings.xml
rename to res/values-hy/strings.xml
index 8e58b6f..c4ff322 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy/strings.xml
@@ -18,7 +18,7 @@
     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="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Բջջային կապով ծանուցման կարգավորումներն անհասանելի են այս օգտատիրոջ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Լավ"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Չկան ակտիվ ահազանգեր ձեր տարածքում: Դուք կարող եք փոխել ահազանգերի կարգավորումները՝ օգտագործելով ցանկը:"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Կարգավորումներ"</string>
@@ -62,7 +62,7 @@
     <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="enable_alert_vibrate_title" msgid="982817538757982090">"Թրթռոց"</string>
     <string name="enable_alert_vibrate_summary" msgid="4328060563316778589">"Թրթռալ զգուշացման ժամանակ"</string>
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Կարգավորումներ Բրազիլիայի համար"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Ցուցադրել 50-րդ ալիքի հեռարձակումները"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Մի անգամ"</item>
     <item msgid="9097229303902157183">"2 րոպեն մեկ"</item>
-    <item msgid="5676933700148002666">"15 րոպեն մեկ"</item>
-    <item msgid="694355015442188708">"Անջատել"</item>
+    <item msgid="5718214950343391480">"5 րոպեն մեկ"</item>
+    <item msgid="3863339891188103437">"15 րոպեն մեկ"</item>
+    <item msgid="6868848414437854609">"Անջատել"</item>
   </string-array>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2900d90..2d6a37a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/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="7559008249836700599">"Siaran Sel"</string>
+    <string name="app_label" msgid="7559008249836700599">"Siaran Seluler"</string>
     <string name="sms_cb_settings" msgid="971917159442705371">"Setelan Siaran Sel"</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>
@@ -44,7 +44,7 @@
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Lansiran darurat (latihan)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Lansiran darurat (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Lansiran darurat"</string>
-    <string name="cb_other_message_identifiers" msgid="7083176204482365281">"Siaran sel"</string>
+    <string name="cb_other_message_identifiers" msgid="7083176204482365281">"Siaran seluler"</string>
     <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Setelan lansiran darurat"</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>
@@ -67,7 +67,7 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Setelan untuk Brasil"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Tampilkan siaran channel 50"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Channel 50 digunakan di Brasil untuk info pembaruan area"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Opsi pengembang"</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>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorologi"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Satu kali"</item>
     <item msgid="9097229303902157183">"Setiap 2 menit"</item>
-    <item msgid="5676933700148002666">"Setiap 15 menit"</item>
-    <item msgid="694355015442188708">"Nonaktif"</item>
+    <item msgid="5718214950343391480">"Setiap 5 menit"</item>
+    <item msgid="3863339891188103437">"Setiap 15 menit"</item>
+    <item msgid="6868848414437854609">"Nonaktif"</item>
   </string-array>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml
similarity index 98%
rename from res/values-is-rIS/strings.xml
rename to res/values-is/strings.xml
index 6681b57..380b13e 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Einu sinni"</item>
     <item msgid="9097229303902157183">"Á 2 mínútna fresti"</item>
-    <item msgid="5676933700148002666">"Á 15 mínútna fresti"</item>
-    <item msgid="694355015442188708">"Slökkt"</item>
+    <item msgid="5718214950343391480">"Á 5 mínútna fresti"</item>
+    <item msgid="3863339891188103437">"Á 15 mínútna fresti"</item>
+    <item msgid="6868848414437854609">"Slökkt"</item>
   </string-array>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5e6abbc..8d6a7db 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Una volta"</item>
     <item msgid="9097229303902157183">"Ogni 2 minuti"</item>
-    <item msgid="5676933700148002666">"Ogni 15 minuti"</item>
-    <item msgid="694355015442188708">"OFF"</item>
+    <item msgid="5718214950343391480">"Ogni 5 minuti"</item>
+    <item msgid="3863339891188103437">"Ogni 15 minuti"</item>
+    <item msgid="6868848414437854609">"Disattivati"</item>
   </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index bb7af38..b0d420d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"פעם אחת"</item>
     <item msgid="9097229303902157183">"כל שתי דקות"</item>
-    <item msgid="5676933700148002666">"כל 15 דקות"</item>
-    <item msgid="694355015442188708">"כבוי"</item>
+    <item msgid="5718214950343391480">"כל 5 דקות"</item>
+    <item msgid="3863339891188103437">"כל 15 דקות"</item>
+    <item msgid="6868848414437854609">"כבוי"</item>
   </string-array>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6ff1c5a..d849d86 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -16,9 +16,9 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="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">"緊急速報メール"</string>
+    <string name="sms_cb_settings" msgid="971917159442705371">"緊急速報メールの設定"</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>
     <string name="menu_preferences" msgid="3596514894131599202">"設定"</string>
@@ -35,22 +35,22 @@
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"津波警報"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"地震津波警報"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"ETWSテストメッセージ"</string>
-    <string name="etws_other_emergency_type" msgid="5233080551309721499">"緊急警報"</string>
+    <string name="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_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="7083176204482365281">"緊急警報"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"緊急警報の設定"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"通知を有効にする"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"緊急警報の内容を表示する"</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="7083176204482365281">"緊急速報メール"</string>
+    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"緊急速報メールの設定"</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="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>
@@ -104,13 +104,14 @@
     <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-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"1回"</item>
     <item msgid="9097229303902157183">"2分毎"</item>
-    <item msgid="5676933700148002666">"15分毎"</item>
-    <item msgid="694355015442188708">"OFF"</item>
+    <item msgid="5718214950343391480">"5 分毎"</item>
+    <item msgid="3863339891188103437">"15 分毎"</item>
+    <item msgid="6868848414437854609">"OFF"</item>
   </string-array>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml
similarity index 97%
rename from res/values-ka-rGE/strings.xml
rename to res/values-ka/strings.xml
index e1aef79..a54c437 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka/strings.xml
@@ -39,7 +39,7 @@
     <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_amber_alert" msgid="6154867710264778887">"ბავშვის გატაცება(amber alert)"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ერთხელ"</item>
     <item msgid="9097229303902157183">"ყოველ 2 წუთში ერთხელ"</item>
-    <item msgid="5676933700148002666">"ყოველ 15 წუთში ერთხელ"</item>
-    <item msgid="694355015442188708">"გამორთვა"</item>
+    <item msgid="5718214950343391480">"ყოველ 5 წუთში"</item>
+    <item msgid="3863339891188103437">"ყოველ 15 წუთში"</item>
+    <item msgid="6868848414437854609">"გამორთული"</item>
   </string-array>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml
similarity index 98%
rename from res/values-kk-rKZ/strings.xml
rename to res/values-kk/strings.xml
index 8f72aee..4ab4c26 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Бір рет"</item>
     <item msgid="9097229303902157183">"2 минут сайын"</item>
-    <item msgid="5676933700148002666">"15 минут сайын"</item>
-    <item msgid="694355015442188708">"Өшірулі"</item>
+    <item msgid="5718214950343391480">"Әр 5 минут сайын"</item>
+    <item msgid="3863339891188103437">"Әр 15 минут сайын"</item>
+    <item msgid="6868848414437854609">"Өшірулі"</item>
   </string-array>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml
similarity index 97%
rename from res/values-km-rKH/strings.xml
rename to res/values-km/strings.xml
index 296532f..fe18075 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"កំណត់​ការ​ផ្សាយ​ចល័ត"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ម្ដង"</item>
     <item msgid="9097229303902157183">"រៀងរាល់ ២​ នាទី"</item>
-    <item msgid="5676933700148002666">"រៀង​រាល់ ១៥​ នាទី"</item>
-    <item msgid="694355015442188708">"បិទ"</item>
+    <item msgid="5718214950343391480">"រាល់ 5 នាទីម្ដង"</item>
+    <item msgid="3863339891188103437">"រាល់ 15 នាទីម្តង"</item>
+    <item msgid="6868848414437854609">"បិទ"</item>
   </string-array>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
similarity index 97%
rename from res/values-kn-rIN/strings.xml
rename to res/values-kn/strings.xml
index b0300d8..092cc31 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn/strings.xml
@@ -30,7 +30,7 @@
     <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="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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ಒಮ್ಮೆ"</item>
     <item msgid="9097229303902157183">"ಪ್ರತಿ 2 ನಿಮಿಷಗಳು"</item>
-    <item msgid="5676933700148002666">"ಪ್ರತಿ 15 ನಿಮಿಷಗಳು"</item>
-    <item msgid="694355015442188708">"ಆಫ್ ಆಗಿದೆ"</item>
+    <item msgid="5718214950343391480">"ಪ್ರತಿ 5 ನಿಮಿಷಗಳಿಗೆ"</item>
+    <item msgid="3863339891188103437">"ಪ್ರತಿ 15 ನಿಮಿಷಗಳಿಗೆ"</item>
+    <item msgid="6868848414437854609">"ಆಫ್"</item>
   </string-array>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2cdd9a2..505bfe5 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"한 번"</item>
     <item msgid="9097229303902157183">"2분마다"</item>
-    <item msgid="5676933700148002666">"15분마다"</item>
-    <item msgid="694355015442188708">"사용 안함"</item>
+    <item msgid="5718214950343391480">"5분마다"</item>
+    <item msgid="3863339891188103437">"15분마다"</item>
+    <item msgid="6868848414437854609">"사용 안함"</item>
   </string-array>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml
similarity index 95%
rename from res/values-ky-rKG/strings.xml
rename to res/values-ky/strings.xml
index 7a0fec1..1e5ac40 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="7559008249836700599">"Уюк таркатмалары"</string>
+    <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="button_dismiss" msgid="1234221657930516287">"OK"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Бир жолу"</item>
     <item msgid="9097229303902157183">"Ар 2 мүнөт сайын"</item>
-    <item msgid="5676933700148002666">"Ар 15 мүнөт сайын"</item>
-    <item msgid="694355015442188708">"Өчүк"</item>
+    <item msgid="5718214950343391480">"5 мүнөт сайын"</item>
+    <item msgid="3863339891188103437">"15 мүнөт сайын"</item>
+    <item msgid="6868848414437854609">"Өчүк"</item>
   </string-array>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml
similarity index 97%
rename from res/values-lo-rLA/strings.xml
rename to res/values-lo/strings.xml
index 40f8028..e084fe3 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"ການຕັ້ງຄ່າການກະຈາຍຂໍ້ມູນ"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ເທື່ອດຽວ"</item>
     <item msgid="9097229303902157183">"ທຸກ 2 ນາ​ທີ"</item>
-    <item msgid="5676933700148002666">"ທຸກ 15 ນາທີ"</item>
-    <item msgid="694355015442188708">"ປິດ"</item>
+    <item msgid="5718214950343391480">"ທຸກໆ 5 ນາທີ"</item>
+    <item msgid="3863339891188103437">"ທຸກ 15 ນາທີ"</item>
+    <item msgid="6868848414437854609">"ປິດ"</item>
   </string-array>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8552c32..150a172 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Kartą"</item>
     <item msgid="9097229303902157183">"Kas 2 min."</item>
-    <item msgid="5676933700148002666">"Kas 15 min."</item>
-    <item msgid="694355015442188708">"Išjungta"</item>
+    <item msgid="5718214950343391480">"Kas 5 min."</item>
+    <item msgid="3863339891188103437">"Kas 15 min."</item>
+    <item msgid="6868848414437854609">"Išjungta"</item>
   </string-array>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f546a13..70ff78f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Vienreiz"</item>
     <item msgid="9097229303902157183">"Ik pēc 2 minūtēm"</item>
-    <item msgid="5676933700148002666">"Ik pēc 15 minūtēm"</item>
-    <item msgid="694355015442188708">"Izslēgts"</item>
+    <item msgid="5718214950343391480">"Ik pēc 5 minūtēm"</item>
+    <item msgid="3863339891188103437">"Ik pēc 15 minūtēm"</item>
+    <item msgid="6868848414437854609">"Izslēgts"</item>
   </string-array>
 </resources>
diff --git a/res/values-mcc246-af/strings.xml b/res/values-mcc246-af/strings.xml
new file mode 100644
index 0000000..561aa20
--- /dev/null
+++ b/res/values-mcc246-af/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-waarskuwing vlak 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-waarskuwing vlak 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-amber"</string>
+</resources>
diff --git a/res/values-mcc246-am/strings.xml b/res/values-mcc246-am/strings.xml
new file mode 100644
index 0000000..da8868a
--- /dev/null
+++ b/res/values-mcc246-am/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-ማንቂያ ደረጃ 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-ማንቂያ ደረጃ 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ar/strings.xml b/res/values-mcc246-ar/strings.xml
new file mode 100644
index 0000000..5ac68b0
--- /dev/null
+++ b/res/values-mcc246-ar/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"‏المستوى الثاني من تنبيهات LT"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"‏المستوى الثالث من تنبيهات LT"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-az/strings.xml b/res/values-mcc246-az/strings.xml
new file mode 100644
index 0000000..a2bcd85
--- /dev/null
+++ b/res/values-mcc246-az/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Səviyyə 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Səviyyə 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Kəhrəba"</string>
+</resources>
diff --git a/res/values-mcc246-b+sr+Latn/strings.xml b/res/values-mcc246-b+sr+Latn/strings.xml
new file mode 100644
index 0000000..787243a
--- /dev/null
+++ b/res/values-mcc246-b+sr+Latn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-obaveštenje drugog nivoa"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-obaveštenje trećeg nivoa"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-be/strings.xml b/res/values-mcc246-be/strings.xml
new file mode 100644
index 0000000..2db0e51
--- /dev/null
+++ b/res/values-mcc246-be/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Абвесткі LT-Alert Узровень 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Абвесткі LT-Alert Узровень 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"Абвесткі LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-bg/strings.xml b/res/values-mcc246-bg/strings.xml
new file mode 100644
index 0000000..e5b8d29
--- /dev/null
+++ b/res/values-mcc246-bg/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert от второ ниво"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert от трето ниво"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-bn/strings.xml b/res/values-mcc246-bn/strings.xml
new file mode 100644
index 0000000..9a5dc2f
--- /dev/null
+++ b/res/values-mcc246-bn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-সতর্কতা লেভেল ২"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-সতর্কতা লেভেল ৩"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-bs/strings.xml b/res/values-mcc246-bs/strings.xml
new file mode 100644
index 0000000..9d462d2
--- /dev/null
+++ b/res/values-mcc246-bs/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Nivo upozorenja 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Nivo upozorenja 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ca/strings.xml b/res/values-mcc246-ca/strings.xml
new file mode 100644
index 0000000..c00d2b1
--- /dev/null
+++ b/res/values-mcc246-ca/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Alerta LT de nivell 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Alerta LT de nivell 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"Alerta LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-cs/strings.xml b/res/values-mcc246-cs/strings.xml
new file mode 100644
index 0000000..edcdda0
--- /dev/null
+++ b/res/values-mcc246-cs/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert – úroveň 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert – úroveň 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-da/strings.xml b/res/values-mcc246-da/strings.xml
new file mode 100644
index 0000000..1987818
--- /dev/null
+++ b/res/values-mcc246-da/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-advarselsniveau 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-advarselsniveau 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-de/strings.xml b/res/values-mcc246-de/strings.xml
new file mode 100644
index 0000000..987b206
--- /dev/null
+++ b/res/values-mcc246-de/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert – Stufe 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert – Stufe 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-el/strings.xml b/res/values-mcc246-el/strings.xml
new file mode 100644
index 0000000..ca857e1
--- /dev/null
+++ b/res/values-mcc246-el/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Επίπεδο ειδοποίησης 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Επίπεδο ειδοποίησης 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-en-rAU/strings.xml b/res/values-mcc246-en-rAU/strings.xml
new file mode 100644
index 0000000..8fc7754
--- /dev/null
+++ b/res/values-mcc246-en-rAU/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Level 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Level 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-en-rGB/strings.xml b/res/values-mcc246-en-rGB/strings.xml
new file mode 100644
index 0000000..8fc7754
--- /dev/null
+++ b/res/values-mcc246-en-rGB/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Level 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Level 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-en-rIN/strings.xml b/res/values-mcc246-en-rIN/strings.xml
new file mode 100644
index 0000000..8fc7754
--- /dev/null
+++ b/res/values-mcc246-en-rIN/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Level 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Level 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-es-rUS/strings.xml b/res/values-mcc246-es-rUS/strings.xml
new file mode 100644
index 0000000..1d0a2b3
--- /dev/null
+++ b/res/values-mcc246-es-rUS/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT (nivel de alerta 2)"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT (nivel de alerta 3)"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT (ámbar)"</string>
+</resources>
diff --git a/res/values-mcc246-es/strings.xml b/res/values-mcc246-es/strings.xml
new file mode 100644
index 0000000..31e18c3
--- /dev/null
+++ b/res/values-mcc246-es/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Alerta de nivel 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Alerta de nivel 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"Alertas AMBER"</string>
+</resources>
diff --git a/res/values-mcc246-et/strings.xml b/res/values-mcc246-et/strings.xml
new file mode 100644
index 0000000..f909616
--- /dev/null
+++ b/res/values-mcc246-et/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT 2. taseme hoiatus"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT 3. taseme hoiatus"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT kollane"</string>
+</resources>
diff --git a/res/values-mcc246-eu/strings.xml b/res/values-mcc246-eu/strings.xml
new file mode 100644
index 0000000..64e5e7c
--- /dev/null
+++ b/res/values-mcc246-eu/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"2. mailako LT alerta"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"3. mailako LT alerta"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT AMBER alerta"</string>
+</resources>
diff --git a/res/values-mcc246-fa/strings.xml b/res/values-mcc246-fa/strings.xml
new file mode 100644
index 0000000..8fc7754
--- /dev/null
+++ b/res/values-mcc246-fa/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Level 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Level 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-fi/strings.xml b/res/values-mcc246-fi/strings.xml
new file mode 100644
index 0000000..6baf9d5
--- /dev/null
+++ b/res/values-mcc246-fi/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-hälytys, taso 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-hälytys, taso 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-AMBER"</string>
+</resources>
diff --git a/res/values-mcc246-fr-rCA/strings.xml b/res/values-mcc246-fr-rCA/strings.xml
new file mode 100644
index 0000000..1637678
--- /dev/null
+++ b/res/values-mcc246-fr-rCA/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alerte de niveau 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alerte de niveau 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Alerte d\'enlèvement"</string>
+</resources>
diff --git a/res/values-mcc246-fr/strings.xml b/res/values-mcc246-fr/strings.xml
new file mode 100644
index 0000000..1f40ec4
--- /dev/null
+++ b/res/values-mcc246-fr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alerte de niveau 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alerte de niveau 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Alerte Enlèvement"</string>
+</resources>
diff --git a/res/values-mcc246-gl/strings.xml b/res/values-mcc246-gl/strings.xml
new file mode 100644
index 0000000..3b43775
--- /dev/null
+++ b/res/values-mcc246-gl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Nivel de alerta 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Nivel de alerta 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Ámbar"</string>
+</resources>
diff --git a/res/values-mcc246-gu/strings.xml b/res/values-mcc246-gu/strings.xml
new file mode 100644
index 0000000..bbdbc3e
--- /dev/null
+++ b/res/values-mcc246-gu/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-ચેતવણી સ્તર 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-ચેતવણી સ્તર 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-અંબર"</string>
+</resources>
diff --git a/res/values-mcc246-hi/strings.xml b/res/values-mcc246-hi/strings.xml
new file mode 100644
index 0000000..f95ad72
--- /dev/null
+++ b/res/values-mcc246-hi/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert स्तर 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert स्तर 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-hr/strings.xml b/res/values-mcc246-hr/strings.xml
new file mode 100644
index 0000000..71d3527
--- /dev/null
+++ b/res/values-mcc246-hr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-upozorenje 2. razine"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-upozorenje 3. razine"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-hu/strings.xml b/res/values-mcc246-hu/strings.xml
new file mode 100644
index 0000000..3723d9e
--- /dev/null
+++ b/res/values-mcc246-hu/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"2. szintű jelzés: LT-Alert"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"3. szintű jelzés: LT-Alert"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber-jelzés"</string>
+</resources>
diff --git a/res/values-mcc246-hy/strings.xml b/res/values-mcc246-hy/strings.xml
new file mode 100644
index 0000000..5f24f00
--- /dev/null
+++ b/res/values-mcc246-hy/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert ահազանգեր, մակարդակ 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert ահազանգեր, մակարդակ 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber ահազանգեր"</string>
+</resources>
diff --git a/res/values-mcc246-in/strings.xml b/res/values-mcc246-in/strings.xml
new file mode 100644
index 0000000..8fc7754
--- /dev/null
+++ b/res/values-mcc246-in/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Level 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Level 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-is/strings.xml b/res/values-mcc246-is/strings.xml
new file mode 100644
index 0000000..f8d92a7
--- /dev/null
+++ b/res/values-mcc246-is/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert, stig 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert, stig 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-it/strings.xml b/res/values-mcc246-it/strings.xml
new file mode 100644
index 0000000..3dad660
--- /dev/null
+++ b/res/values-mcc246-it/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert - Livello 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert - Livello 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-iw/strings.xml b/res/values-mcc246-iw/strings.xml
new file mode 100644
index 0000000..acb3384
--- /dev/null
+++ b/res/values-mcc246-iw/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"‏התראת LT רמה 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"‏התראת LT רמה 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ja/strings.xml b/res/values-mcc246-ja/strings.xml
new file mode 100644
index 0000000..8fc7754
--- /dev/null
+++ b/res/values-mcc246-ja/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Level 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Level 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ka/strings.xml b/res/values-mcc246-ka/strings.xml
new file mode 100644
index 0000000..dbb7cf1
--- /dev/null
+++ b/res/values-mcc246-ka/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert, დონე 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert, დონე 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-kk/strings.xml b/res/values-mcc246-kk/strings.xml
new file mode 100644
index 0000000..1e76ef9
--- /dev/null
+++ b/res/values-mcc246-kk/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT–2-ші дабыл деңгейі"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT–3-ші дабыл деңгейі"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-AMBER"</string>
+</resources>
diff --git a/res/values-mcc246-km/strings.xml b/res/values-mcc246-km/strings.xml
new file mode 100644
index 0000000..5b393de
--- /dev/null
+++ b/res/values-mcc246-km/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert កម្រិតទី 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert កម្រិតទី 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-kn/strings.xml b/res/values-mcc246-kn/strings.xml
new file mode 100644
index 0000000..2c9047b
--- /dev/null
+++ b/res/values-mcc246-kn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-ಎಚ್ಚರಿಕೆ ಹಂತ 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-ಎಚ್ಚರಿಕೆ ಹಂತ 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-ಆಂಬರ್"</string>
+</resources>
diff --git a/res/values-mcc246-ko/strings.xml b/res/values-mcc246-ko/strings.xml
new file mode 100644
index 0000000..40c7ab4
--- /dev/null
+++ b/res/values-mcc246-ko/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-경고 레벨 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-경고 레벨 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-앰버"</string>
+</resources>
diff --git a/res/values-mcc246-ky/strings.xml b/res/values-mcc246-ky/strings.xml
new file mode 100644
index 0000000..8f7fbda
--- /dev/null
+++ b/res/values-mcc246-ky/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Эскертүүлөр (2-деңгээл)"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Эскертүүлөр (3-деңгээл)"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-lo/strings.xml b/res/values-mcc246-lo/strings.xml
new file mode 100644
index 0000000..7b680f8
--- /dev/null
+++ b/res/values-mcc246-lo/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert ລະດັບ 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert ລະດັບ 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-lt/strings.xml b/res/values-mcc246-lt/strings.xml
new file mode 100644
index 0000000..adc51cd
--- /dev/null
+++ b/res/values-mcc246-lt/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"„LT-Alert“ (2 lygis)"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"„LT-Alert“ (3 lygis)"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-lv/strings.xml b/res/values-mcc246-lv/strings.xml
new file mode 100644
index 0000000..e0bdf24
--- /dev/null
+++ b/res/values-mcc246-lv/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert 2. līmenis"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert 3. līmenis"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-mk/strings.xml b/res/values-mcc246-mk/strings.xml
new file mode 100644
index 0000000..e67c1b3
--- /dev/null
+++ b/res/values-mcc246-mk/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Ниво на предупредување 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Ниво на предупредување 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ml/strings.xml b/res/values-mcc246-ml/strings.xml
new file mode 100644
index 0000000..7517f8f
--- /dev/null
+++ b/res/values-mcc246-ml/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-അലേർട്ട് ലെവൽ 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-അലേർട്ട് ലെവൽ 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-ആമ്പർ"</string>
+</resources>
diff --git a/res/values-mcc246-mn/strings.xml b/res/values-mcc246-mn/strings.xml
new file mode 100644
index 0000000..12246d4
--- /dev/null
+++ b/res/values-mcc246-mn/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT анхааруулгын 2-р түвшин"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT анхааруулгын 3-р түвшин"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-mr/strings.xml b/res/values-mcc246-mr/strings.xml
new file mode 100644
index 0000000..191fc5e
--- /dev/null
+++ b/res/values-mcc246-mr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-सूचना स्तर 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-सूचना स्तर 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-अँबर"</string>
+</resources>
diff --git a/res/values-mcc246-ms/strings.xml b/res/values-mcc246-ms/strings.xml
new file mode 100644
index 0000000..0ac0a98
--- /dev/null
+++ b/res/values-mcc246-ms/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Amaran Tahap 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Amaran Tahap 1"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-my/strings.xml b/res/values-mcc246-my/strings.xml
new file mode 100644
index 0000000..360fec2
--- /dev/null
+++ b/res/values-mcc246-my/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert အဆင့် ၂"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert အဆင့် ၃"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-nb/strings.xml b/res/values-mcc246-nb/strings.xml
new file mode 100644
index 0000000..915bb7e
--- /dev/null
+++ b/res/values-mcc246-nb/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-advarselsnivå 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-advarselsnivå 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ne/strings.xml b/res/values-mcc246-ne/strings.xml
new file mode 100644
index 0000000..5bbf5e3
--- /dev/null
+++ b/res/values-mcc246-ne/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-चेतावनी स्तर २"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-चेतावनी स्तर ३"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-एम्बर"</string>
+</resources>
diff --git a/res/values-mcc246-nl/strings.xml b/res/values-mcc246-nl/strings.xml
new file mode 100644
index 0000000..d9eb5d9
--- /dev/null
+++ b/res/values-mcc246-nl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-waarschuwing niveau 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-waarschuwing niveau 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber Alert"</string>
+</resources>
diff --git a/res/values-mcc246-pa/strings.xml b/res/values-mcc246-pa/strings.xml
new file mode 100644
index 0000000..5228bd5
--- /dev/null
+++ b/res/values-mcc246-pa/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert ਪੱਧਰ 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert ਪੱਧਰ 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-pl/strings.xml b/res/values-mcc246-pl/strings.xml
new file mode 100644
index 0000000..6e97a9d
--- /dev/null
+++ b/res/values-mcc246-pl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-poziom alertu 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-poziom alertu 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-pt-rPT/strings.xml b/res/values-mcc246-pt-rPT/strings.xml
new file mode 100644
index 0000000..c6ac81d
--- /dev/null
+++ b/res/values-mcc246-pt-rPT/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert nível 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert nível 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-pt/strings.xml b/res/values-mcc246-pt/strings.xml
new file mode 100644
index 0000000..fc1685e
--- /dev/null
+++ b/res/values-mcc246-pt/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Nível 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Nível 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ro/strings.xml b/res/values-mcc246-ro/strings.xml
new file mode 100644
index 0000000..3c83e9e
--- /dev/null
+++ b/res/values-mcc246-ro/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert Nivelul 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert Nivelul 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ru/strings.xml b/res/values-mcc246-ru/strings.xml
new file mode 100644
index 0000000..9eed331
--- /dev/null
+++ b/res/values-mcc246-ru/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Оповещения (уровень 2)"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Оповещения (уровень 3)"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"Оповещения AMBER"</string>
+</resources>
diff --git a/res/values-mcc246-si/strings.xml b/res/values-mcc246-si/strings.xml
new file mode 100644
index 0000000..144abb1
--- /dev/null
+++ b/res/values-mcc246-si/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-ඇඟවීම් මට්ටම 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-ඇඟවීම් මට්ටම 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-sk/strings.xml b/res/values-mcc246-sk/strings.xml
new file mode 100644
index 0000000..bf064a4
--- /dev/null
+++ b/res/values-mcc246-sk/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert – 2. úroveň"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert – 3. úroveň"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-sl/strings.xml b/res/values-mcc246-sl/strings.xml
new file mode 100644
index 0000000..722a9e5
--- /dev/null
+++ b/res/values-mcc246-sl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Opozorilo LT 2. stopnje"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Opozorilo LT 3. stopnje"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"Opozorila LT AMBER"</string>
+</resources>
diff --git a/res/values-mcc246-sq/strings.xml b/res/values-mcc246-sq/strings.xml
new file mode 100644
index 0000000..8047b0a
--- /dev/null
+++ b/res/values-mcc246-sq/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Sinjalizim niveli 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Sinjalizim niveli 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Portokalli"</string>
+</resources>
diff --git a/res/values-mcc246-sr/strings.xml b/res/values-mcc246-sr/strings.xml
new file mode 100644
index 0000000..90600c3
--- /dev/null
+++ b/res/values-mcc246-sr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-обавештење другог нивоа"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-обавештење трећег нивоа"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-sv/strings.xml b/res/values-mcc246-sv/strings.xml
new file mode 100644
index 0000000..0171cc1
--- /dev/null
+++ b/res/values-mcc246-sv/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-varning nivå 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-varning nivå 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-sw/strings.xml b/res/values-mcc246-sw/strings.xml
new file mode 100644
index 0000000..d5e65dc
--- /dev/null
+++ b/res/values-mcc246-sw/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Arifa za EU Kiwango cha 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Arifa za EU Kiwango cha 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"Arifa za EU za utekaji nyara"</string>
+</resources>
diff --git a/res/values-mcc246-ta/strings.xml b/res/values-mcc246-ta/strings.xml
new file mode 100644
index 0000000..f6a19e5
--- /dev/null
+++ b/res/values-mcc246-ta/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-விழிப்பூட்டல் நிலை 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-விழிப்பூட்டல் நிலை 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-te/strings.xml b/res/values-mcc246-te/strings.xml
new file mode 100644
index 0000000..e92afbe
--- /dev/null
+++ b/res/values-mcc246-te/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-హెచ్చరిక స్థాయి 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-హెచ్చరిక స్థాయి 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-th/strings.xml b/res/values-mcc246-th/strings.xml
new file mode 100644
index 0000000..96204e9
--- /dev/null
+++ b/res/values-mcc246-th/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-ระดับการแจ้งเตือน 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-ระดับการแจ้งเตือน 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-tl/strings.xml b/res/values-mcc246-tl/strings.xml
new file mode 100644
index 0000000..09a654a
--- /dev/null
+++ b/res/values-mcc246-tl/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Antas ng Alerto 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Antas ng Alerto 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-tr/strings.xml b/res/values-mcc246-tr/strings.xml
new file mode 100644
index 0000000..ed7be85
--- /dev/null
+++ b/res/values-mcc246-tr/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Uyarı Düzeyi 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Uyarı Düzeyi 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Sarı"</string>
+</resources>
diff --git a/res/values-mcc246-uk/strings.xml b/res/values-mcc246-uk/strings.xml
new file mode 100644
index 0000000..514c58c
--- /dev/null
+++ b/res/values-mcc246-uk/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert 2 рівня"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert 3 рівня"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-ur/strings.xml b/res/values-mcc246-ur/strings.xml
new file mode 100644
index 0000000..ec94b6f
--- /dev/null
+++ b/res/values-mcc246-ur/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"‏LT الرٹ درجہ 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"‏LT الرٹ درجہ 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-uz/strings.xml b/res/values-mcc246-uz/strings.xml
new file mode 100644
index 0000000..cda2719
--- /dev/null
+++ b/res/values-mcc246-uz/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"Ogohlantirish (2-daraja)"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"Ogohlantirish (3-daraja)"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"AMBER ogohlantirishi"</string>
+</resources>
diff --git a/res/values-mcc246-vi/strings.xml b/res/values-mcc246-vi/strings.xml
new file mode 100644
index 0000000..a3e9000
--- /dev/null
+++ b/res/values-mcc246-vi/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert mức độ 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert mức độ 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-zh-rCN/strings.xml b/res/values-mcc246-zh-rCN/strings.xml
new file mode 100644
index 0000000..e54d0ea
--- /dev/null
+++ b/res/values-mcc246-zh-rCN/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-第 2 级警报"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-第 3 级警报"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-安珀警报"</string>
+</resources>
diff --git a/res/values-mcc246-zh-rHK/strings.xml b/res/values-mcc246-zh-rHK/strings.xml
new file mode 100644
index 0000000..52384f0
--- /dev/null
+++ b/res/values-mcc246-zh-rHK/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-Alert 第 2 級"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-Alert 第 3 級"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-Amber"</string>
+</resources>
diff --git a/res/values-mcc246-zh-rTW/strings.xml b/res/values-mcc246-zh-rTW/strings.xml
new file mode 100644
index 0000000..b6c08a4
--- /dev/null
+++ b/res/values-mcc246-zh-rTW/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-第 2 級警報"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-第 3 級警報"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-安珀警報"</string>
+</resources>
diff --git a/res/values-mcc246-zu/strings.xml b/res/values-mcc246-zu/strings.xml
new file mode 100644
index 0000000..bcb3cef
--- /dev/null
+++ b/res/values-mcc246-zu/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"I-LT-Alert Level 2"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"I-LT-Alert Level 3"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"I-LT-Amber"</string>
+</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml
similarity index 97%
rename from res/values-mk-rMK/strings.xml
rename to res/values-mk/strings.xml
index d1f190b..dbecebf 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk/strings.xml
@@ -67,7 +67,7 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Поставки за Бразил"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Прикажи емитувања од канал 50"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Канал 50 се користи во Бразил за ажурирање локални информации"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Опции на развивач"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Еднаш"</item>
     <item msgid="9097229303902157183">"Секои 2 минути"</item>
-    <item msgid="5676933700148002666">"Секои 15 минути"</item>
-    <item msgid="694355015442188708">"Исклучено"</item>
+    <item msgid="5718214950343391480">"На 5 минути"</item>
+    <item msgid="3863339891188103437">"На 15 минути"</item>
+    <item msgid="6868848414437854609">"Исклучено"</item>
   </string-array>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
similarity index 97%
rename from res/values-ml-rIN/strings.xml
rename to res/values-ml/strings.xml
index 467f257..525cec1 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml/strings.xml
@@ -21,10 +21,10 @@
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ഈ ഉപയോക്താവിനായി സെൽ പ്രക്ഷേപണ ക്രമീകരണങ്ങൾ ലഭ്യമല്ല"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ശരി"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"നിങ്ങളുടെ ഏരിയയിൽ സജീവ അലേർട്ടുകളൊന്നുമില്ല. ക്രമീകരണങ്ങളുടെ മെനു ഓപ്‌ഷൻ ഉപയോഗിച്ച് അലേർട്ട് ക്രമീകരണങ്ങൾ നിങ്ങൾക്ക് മാറ്റാനാകും."</string>
-    <string name="menu_preferences" msgid="3596514894131599202">"ക്രമീകരണങ്ങൾ"</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_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>
@@ -67,7 +67,7 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"ബ്രസീലിനുള്ള ക്രമീകരണങ്ങൾ"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"ചാനൽ 50 പ്രക്ഷേപണങ്ങൾ കാണിക്കുക"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"ഏരിയ അപ്‌ഡേറ്റുചെയ്യൽ വിവരത്തിന് ബ്രസീലിൽ ചാനൽ 50 ഉപയോഗിക്കുന്നു"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"ഡവലപ്പർ ഓ‌പ്ഷനുകൾ"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ഒരിക്കല്‍"</item>
     <item msgid="9097229303902157183">"എല്ലാ 2 മിനിറ്റിലും"</item>
-    <item msgid="5676933700148002666">"ഓരോ 15 മിനിറ്റിലും"</item>
-    <item msgid="694355015442188708">"ഓഫാണ്"</item>
+    <item msgid="5718214950343391480">"എല്ലാ 5 മിനിറ്റിലും"</item>
+    <item msgid="3863339891188103437">"ഓരോ 15 മിനിറ്റിലും"</item>
+    <item msgid="6868848414437854609">"ഓഫ്"</item>
   </string-array>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml
similarity index 97%
rename from res/values-mn-rMN/strings.xml
rename to res/values-mn/strings.xml
index e5aeaf1..bb44039 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn/strings.xml
@@ -19,7 +19,7 @@
     <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="button_dismiss" msgid="1234221657930516287">"Тийм"</string>
+    <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Таны байгаа бүсэд идэвхтэй сэрэмжлүүлэг алга байна. Та Сэрэмжлүүлгийн тохиргоог Тохиргоо цэсний сонголтоос өөрчилж болно."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Тохиргоо"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Нэвтрүүлгүүдийг устгах"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Нэг удаа"</item>
     <item msgid="9097229303902157183">"2 минут тутамд"</item>
-    <item msgid="5676933700148002666">"15 минут тутамд"</item>
-    <item msgid="694355015442188708">"Идэвхгүй"</item>
+    <item msgid="5718214950343391480">"5 минут тутамд"</item>
+    <item msgid="3863339891188103437">"15 минут тутамд"</item>
+    <item msgid="6868848414437854609">"Унтраалттай"</item>
   </string-array>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
similarity index 98%
rename from res/values-mr-rIN/strings.xml
rename to res/values-mr/strings.xml
index b4de57d..1769d57 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"एकदा"</item>
     <item msgid="9097229303902157183">"दर 2 मिनिटांनी"</item>
-    <item msgid="5676933700148002666">"दर 15 मिनिटांनी"</item>
-    <item msgid="694355015442188708">"बंद"</item>
+    <item msgid="5718214950343391480">"दर 5 मिनिटांनी"</item>
+    <item msgid="3863339891188103437">"दर 15 मिनिटांनी"</item>
+    <item msgid="6868848414437854609">"बंद"</item>
   </string-array>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
similarity index 98%
rename from res/values-ms-rMY/strings.xml
rename to res/values-ms/strings.xml
index 0cbc399..2381db0 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Sekali"</item>
     <item msgid="9097229303902157183">"Setiap 2 minit"</item>
-    <item msgid="5676933700148002666">"Setiap 15 minit"</item>
-    <item msgid="694355015442188708">"Matikan"</item>
+    <item msgid="5718214950343391480">"Setiap 5 minit"</item>
+    <item msgid="3863339891188103437">"Setiap 15 minit"</item>
+    <item msgid="6868848414437854609">"Mati"</item>
   </string-array>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml
similarity index 91%
rename from res/values-my-rMM/strings.xml
rename to res/values-my/strings.xml
index 75e35c8..3eb08aa 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my/strings.xml
@@ -16,12 +16,12 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="7559008249836700599">"ဆဲလ် ထုတ်လွှင့်ချက်များ"</string>
-    <string name="sms_cb_settings" msgid="971917159442705371">"ဆဲလ် ထုတ်လွှင့်မှု သတ်မှတ်ချက်များ"</string>
+    <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="button_dismiss" msgid="1234221657930516287">"အိုကေ"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"သင်၏ ဒေသမှာ လိုက်နာရမည့် သတိပေးချက်များ မရှိပါ။ သင်သည် သတ်မှတ်ချက်များ မီးနူးကို သုံးပြီး သတိပေးရေး သတ်မှတ်ချက်များကို ပြောင်းနိုင်သည်။"</string>
-    <string name="menu_preferences" msgid="3596514894131599202">"သတ်မှတ်ချက်များ"</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>
@@ -29,8 +29,8 @@
     <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="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,13 +45,13 @@
     <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="emergency_alert_settings_title" msgid="5427868392642771940">"အရေးပေါ် သတိပေးချက် ဆက်တင်များ"</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="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>
@@ -64,9 +64,9 @@
     <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"စီးပွားဖြစ် မိုဘိုင်း သတိပေးရေး စနစ် အတွက် စမ်းသပ်ရေး ထုတ်လွှင့်ချက်များကို ပြပါ"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"တုန်ခါမှု"</string>
     <string name="enable_alert_vibrate_summary" msgid="4328060563316778589">"သတိပေးလျှင် တုန်ခါပါ"</string>
-    <string name="category_brazil_settings_title" msgid="6343130548572319922">"ဘရာဇီးလ်အတွက် သတ်မှတ်ချက်များ"</string>
+    <string name="category_brazil_settings_title" msgid="6343130548572319922">"ဘရာဇီးလ်အတွက် ဆက်တင်များ"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"ချာနယ် ၅၀ ထုတ်လွှင့်မှုများကို ပြပါ"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"ဘရာဇီးလ်နိုင်ငံမှာ ဒေသအလိုက် သတင်း အသစ်များ ထုတ်လွှင့်ရေးအတွက် ချာနယ် ၅၀ ကို အသုံးပြုသည်"</string>
+    <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"ဘရာဇီးနိုင်ငံတွင် ဒေသဆိုင်ရာ သတင်း အသစ်များ ထုတ်လွှင့်ရေးအတွက် ချန်နယ် ၅၀ ကို အသုံးပြုသည်"</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>
@@ -105,12 +105,13 @@
     <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="cmas_opt_out_button_yes" msgid="7248930667195432936">"Yes"</string>
+    <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"No"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"တစ်ကြိမ်"</item>
     <item msgid="9097229303902157183">"၂ မိနစ်တိုင်း"</item>
-    <item msgid="5676933700148002666">"၁၅ မိနစ်တိုင်း"</item>
-    <item msgid="694355015442188708">"ပိတ်"</item>
+    <item msgid="5718214950343391480">"၅ မိနစ်တိုင်း"</item>
+    <item msgid="3863339891188103437">"၁၅ မိနစ်တိုင်း"</item>
+    <item msgid="6868848414437854609">"ပိတ်ပါ"</item>
   </string-array>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a1f09ae..566ab0a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Én gang"</item>
     <item msgid="9097229303902157183">"Hvert 2. minutt"</item>
-    <item msgid="5676933700148002666">"Hvert 15. minutt"</item>
-    <item msgid="694355015442188708">"Av"</item>
+    <item msgid="5718214950343391480">"Hvert femte minutt"</item>
+    <item msgid="3863339891188103437">"Hvert 15. minutt"</item>
+    <item msgid="6868848414437854609">"Av"</item>
   </string-array>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml
similarity index 94%
rename from res/values-ne-rNP/strings.xml
rename to res/values-ne/strings.xml
index dc2a8f2..6fd7421 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"सेल प्रसारण सेटिङहरू"</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>
@@ -67,7 +67,7 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"ब्राजिलको लागि सेटिङहरू"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"च्यानल ५० प्रसारणहरू देखाउनुहोस्"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"च्यानल ५० ब्राजिलमा क्षेत्र अपडेट जानकारीको लागि प्रयोग गरिन्छ"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"विकासकर्ता विकल्पहरू"</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>
@@ -104,13 +104,14 @@
     <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-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"एक पटक"</item>
     <item msgid="9097229303902157183">"हरेक २ मिनेट"</item>
-    <item msgid="5676933700148002666">"हरेक १५ मिनेट"</item>
-    <item msgid="694355015442188708">"बन्द"</item>
+    <item msgid="5718214950343391480">"हरेक ५ मिनेट"</item>
+    <item msgid="3863339891188103437">"हरेक १५ मिनेट"</item>
+    <item msgid="6868848414437854609">"निष्क्रिय"</item>
   </string-array>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index dd7b75d..f85026b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"Instellingen voor cell broadcasts"</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>
+    <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>
     <string name="menu_preferences" msgid="3596514894131599202">"Instellingen"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Broadcasts verwijderen"</string>
     <string name="message_options" msgid="3178489901903589574">"Berichtopties"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Eenmalig"</item>
     <item msgid="9097229303902157183">"Elke 2 minuten"</item>
-    <item msgid="5676933700148002666">"Elke 15 minuten"</item>
-    <item msgid="694355015442188708">"Uit"</item>
+    <item msgid="5718214950343391480">"Elke 5 minuten"</item>
+    <item msgid="3863339891188103437">"Elke 15 minuten"</item>
+    <item msgid="6868848414437854609">"Uit"</item>
   </string-array>
 </resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml
similarity index 91%
rename from res/values-pa-rIN/strings.xml
rename to res/values-pa/strings.xml
index 431197c..601884c 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="7559008249836700599">"ਸੈਲ ਪ੍ਰਸਾਰਨ"</string>
+    <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="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>
@@ -47,23 +47,23 @@
     <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">"ਸੂਚਨਾਵਾਂ ਚਾਲੂ ਕਰੋ"</string>
-    <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀ ਪ੍ਰਸਾਰਨ ਡਿਸਪਲੇ ਕਰੋ"</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">"ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀ ਸੁਨੇਹੇ ਬੋਲਣ ਲਈ text-to-speech ਵਰਤੋ"</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">"ਭੂਚਾਲ Tsunami ਚਿਤਾਵਨੀ ਸਿਸਟਮ ਲਈ ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਡਿਸਪਲੇ ਕਰੋ"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"ਭੂਚਾਲ Tsunami ਚਿਤਾਵਨੀ ਸਿਸਟਮ ਲਈ ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</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_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_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_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="enable_alert_vibrate_summary" msgid="4328060563316778589">"ਚਿਤਾਵਨੀ ਤੇ ਵਾਈਬ੍ਰੇਟ"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"ਕਮਰਸ਼ੀਅਲ ਮੋਬਾਈਲ ਚਿਤਾਵਨੀ ਸਿਸਟਮ ਲਈ ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰੋ"</string>
+    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
+    <string name="enable_alert_vibrate_summary" msgid="4328060563316778589">"ਚਿਤਾਵਨੀ ਤੇ ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"ਬ੍ਰਾਜ਼ੀਲ ਲਈ ਸੈਟਿੰਗਾਂ"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"ਚੈਨਲ 50 ਦੇ ਪ੍ਰਸਾਰਨ ਦਿਖਾਓ"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"ਚੈਨਲ 50 ਖੇਤਰ ਅਪਡੇਟ ਜਾਣਕਾਰੀ ਲਈ ਬ੍ਰਾਜ਼ੀਲ ਵਿੱਚ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ਇੱਕ ਵਾਰ"</item>
     <item msgid="9097229303902157183">"ਹਰੇਕ 2 ਮਿੰਟਾਂ ਵਿੱਚ"</item>
-    <item msgid="5676933700148002666">"ਹਰੇਕ 15 ਮਿੰਟਾਂ ਵਿੱਚ"</item>
-    <item msgid="694355015442188708">"ਬੰਦ"</item>
+    <item msgid="5718214950343391480">"ਹਰੇਕ 5 ਮਿੰਟਾਂ ਵਿੱਚ"</item>
+    <item msgid="3863339891188103437">"ਹਰੇਕ 15 ਮਿੰਟਾਂ ਵਿੱਚ"</item>
+    <item msgid="6868848414437854609">"ਬੰਦ"</item>
   </string-array>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 94378eb..c638d58 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"Ustawienia komunikatów z sieci komórkowej"</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. Alerty 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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Raz"</item>
     <item msgid="9097229303902157183">"Co 2 minuty"</item>
-    <item msgid="5676933700148002666">"Co 15 minut"</item>
-    <item msgid="694355015442188708">"Wył."</item>
+    <item msgid="5718214950343391480">"Co 5 minut"</item>
+    <item msgid="3863339891188103437">"Co 15 minut"</item>
+    <item msgid="6868848414437854609">"Wył."</item>
   </string-array>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 240ff1d..21fd481 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -16,11 +16,11 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="7559008249836700599">"Transmissões Celulares"</string>
+    <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="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 Alerta utilizando a opção do menu Definições."</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>
     <string name="menu_preferences" msgid="3596514894131599202">"Definições"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Eliminar transmissões"</string>
     <string name="message_options" msgid="3178489901903589574">"Opções da mensagem"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Uma vez"</item>
     <item msgid="9097229303902157183">"De 2 em 2 minutos"</item>
-    <item msgid="5676933700148002666">"De 15 em 15 minutos"</item>
-    <item msgid="694355015442188708">"Desativado"</item>
+    <item msgid="5718214950343391480">"De 5 em 5 minutos"</item>
+    <item msgid="3863339891188103437">"De 15 em 15 minutos"</item>
+    <item msgid="6868848414437854609">"Desativados"</item>
   </string-array>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index eedf468..e5fa01c 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">"Config. de transmissão por celular"</string>
+    <string name="sms_cb_settings" msgid="971917159442705371">"Configurar transmissão por celular"</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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Uma vez"</item>
     <item msgid="9097229303902157183">"A cada 2 minutos"</item>
-    <item msgid="5676933700148002666">"A cada 15 minutos"</item>
-    <item msgid="694355015442188708">"Desativado"</item>
+    <item msgid="5718214950343391480">"A cada cinco minutos"</item>
+    <item msgid="3863339891188103437">"A cada 15 minutos"</item>
+    <item msgid="6868848414437854609">"Desativados"</item>
   </string-array>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 527e089..eb7ac78 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -20,54 +20,54 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"Setări pentru transmisia celulară"</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>
+    <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>
     <string name="menu_preferences" msgid="3596514894131599202">"Setări"</string>
-    <string name="menu_delete_all" msgid="3940997343921149800">"Ștergeţi difuzările"</string>
-    <string name="message_options" msgid="3178489901903589574">"Opţiuni mesaj"</string>
-    <string name="menu_view_details" msgid="1040989019045280975">"Afişaţi detaliile"</string>
-    <string name="menu_delete" msgid="128380070910799366">"Ștergeţi difuzarea"</string>
+    <string name="menu_delete_all" msgid="3940997343921149800">"Ștergeți difuzările"</string>
+    <string name="message_options" msgid="3178489901903589574">"Opțiuni mesaj"</string>
+    <string name="menu_view_details" msgid="1040989019045280975">"Afișați detaliile"</string>
+    <string name="menu_delete" msgid="128380070910799366">"Ștergeți difuzarea"</string>
     <string name="view_details_title" msgid="1780427629491781473">"Detalii alertă"</string>
-    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Ștergeţi difuzarea?"</string>
-    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Ștergeţi toate mesajele difuzate primite?"</string>
-    <string name="button_delete" msgid="4672451757925194350">"Ștergeţi"</string>
+    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Ștergeți difuzarea?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Ștergeți toate mesajele difuzate primite?"</string>
+    <string name="button_delete" msgid="4672451757925194350">"Ștergeți"</string>
     <string name="button_cancel" msgid="7479958360523246140">"Anulați"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"Avertizare de cutremur"</string>
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"Avertizare de tsunami"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Avertizare de cutremur și tsunami"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"Mesaj de testare ETWS"</string>
-    <string name="etws_other_emergency_type" msgid="5233080551309721499">"Avertizare de urgenţă"</string>
+    <string name="etws_other_emergency_type" msgid="5233080551309721499">"Avertizare de urgență"</string>
     <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Alertă prezidențială"</string>
-    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Alertă de urgenţă: extremă"</string>
-    <string name="cmas_severe_alert" msgid="4135809475315826913">"Alertă de urgenţă: severă"</string>
+    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Alertă de urgență: extremă"</string>
+    <string name="cmas_severe_alert" msgid="4135809475315826913">"Alertă de urgență: severă"</string>
     <string name="cmas_amber_alert" msgid="6154867710264778887">"Răpire copil (alertă Amber)"</string>
-    <string name="cmas_required_monthly_test" msgid="6464047268150108932">"Testare lunară pentru alerte de urgenţă"</string>
-    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Alertă de urgenţă (exercițiu)"</string>
-    <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="cmas_required_monthly_test" msgid="6464047268150108932">"Testare lunară pentru alerte de urgență"</string>
+    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Alertă de urgență (exercițiu)"</string>
+    <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="7083176204482365281">"Transmisie celulară"</string>
-    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Setări pentru alerte de urgenţă"</string>
+    <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Setări pentru alerte de urgență"</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_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="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="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="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrare"</string>
     <string name="enable_alert_vibrate_summary" msgid="4328060563316778589">"Vibrare la alertă"</string>
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Setări pentru Brazilia"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Afişaţi difuz. pt. canalul 50"</string>
+    <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Afișați difuz. pt. canalul 50"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Canalul 50 este utilizat în Brazilia pentru informații despre actualizarea zonelor"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Opțiuni dezvoltator"</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>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorologic"</string>
@@ -84,11 +84,11 @@
     <string name="cmas_response_heading" msgid="4205379547245540163">"Tipul de răspuns:"</string>
     <string name="cmas_response_shelter" msgid="7301175579079615909">"Adăpostiți-vă într-un refugiu"</string>
     <string name="cmas_response_evacuate" msgid="5833170084430021095">"Evacuați"</string>
-    <string name="cmas_response_prepare" msgid="8428073909753758319">"Faceţi pregătiri"</string>
-    <string name="cmas_response_execute" msgid="284719420769568493">"Executaţi"</string>
+    <string name="cmas_response_prepare" msgid="8428073909753758319">"Faceți pregătiri"</string>
+    <string name="cmas_response_execute" msgid="284719420769568493">"Executați"</string>
     <string name="cmas_response_monitor" msgid="681400164440495749">"Monitorizați"</string>
     <string name="cmas_response_avoid" msgid="156419597612629270">"Evitați"</string>
-    <string name="cmas_response_assess" msgid="9043534222710563415">"Evaluaţi"</string>
+    <string name="cmas_response_assess" msgid="9043534222710563415">"Evaluați"</string>
     <string name="cmas_response_none" msgid="5149009359674452959">"Niciuna"</string>
     <string name="cmas_severity_heading" msgid="8437057117822305243">"Gravitate:"</string>
     <string name="cmas_severity_extreme" msgid="1312013282860183082">"Extremă"</string>
@@ -100,17 +100,18 @@
     <string name="cmas_certainty_observed" msgid="3668549749352106472">"Constatată"</string>
     <string name="cmas_certainty_likely" msgid="4254497828943291749">"Probabilă"</string>
     <string name="delivery_time_heading" msgid="5980836543433619329">"Primit:"</string>
-    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> (de) alerte necitite."</string>
+    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g>   alerte necitite."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Alerte noi"</string>
-    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Afişaţi un dialog de renunţare după afişarea primei alerte CMAS (altele decât alerta prezidențială)."</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Afişaţi un dialog de renunţare"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"În prezent, primiţi alerte de urgenţă. Doriți să primiţi în continuare alerte de urgenţă?"</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Afișați un dialog de renunțare după afișarea primei alerte CMAS (altele decât alerta prezidențială)."</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Afișați un dialog de renunțare"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"În prezent, primiți alerte de urgență. Doriți să primiți în continuare alerte de urgență?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Da"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nu"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"O singură dată"</item>
     <item msgid="9097229303902157183">"La fiecare 2 minute"</item>
-    <item msgid="5676933700148002666">"La fiecare 15 minute"</item>
-    <item msgid="694355015442188708">"Dezactivat"</item>
+    <item msgid="5718214950343391480">"La fiecare 5 minute"</item>
+    <item msgid="3863339891188103437">"La fiecare 15 minute"</item>
+    <item msgid="6868848414437854609">"Dezactivate"</item>
   </string-array>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 467324e..961a6c9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Один раз"</item>
     <item msgid="9097229303902157183">"Каждые 2 минуты"</item>
-    <item msgid="5676933700148002666">"Каждые 15 минут"</item>
-    <item msgid="694355015442188708">"Отключить"</item>
+    <item msgid="5718214950343391480">"Каждые 5 минут"</item>
+    <item msgid="3863339891188103437">"Каждые 15 минут"</item>
+    <item msgid="6868848414437854609">"Отключить"</item>
   </string-array>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml
similarity index 97%
rename from res/values-si-rLK/strings.xml
rename to res/values-si/strings.xml
index 1f0606f..6a0838d 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"වතාවක්"</item>
     <item msgid="9097229303902157183">"සෑම මිනිත්තු 2 කට වරක්"</item>
-    <item msgid="5676933700148002666">"සෑම මිනිත්තු 15 කට වරක්"</item>
-    <item msgid="694355015442188708">"අක්‍රිය කරන්න"</item>
+    <item msgid="5718214950343391480">"සෑම මිනිත්තු 5කට වරක්"</item>
+    <item msgid="3863339891188103437">"සෑම මිනිත්තු 15කට වරක්"</item>
+    <item msgid="6868848414437854609">"ක්‍රියාවිරහිතයි"</item>
   </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0200568..9e14ebb 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/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="7559008249836700599">"Cell Broadcast"</string>
+    <string name="app_label" msgid="7559008249836700599">"Cell broadcast"</string>
     <string name="sms_cb_settings" msgid="971917159442705371">"Nastavenia správ Cell Broadcast"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Nastavenia technológie Cell Broadcast pre tohto používateľa nie sú dostupné"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Raz"</item>
     <item msgid="9097229303902157183">"Každé 2 minúty"</item>
-    <item msgid="5676933700148002666">"Každých 15 minút"</item>
-    <item msgid="694355015442188708">"Vypnuté"</item>
+    <item msgid="5718214950343391480">"Každých 5 minút"</item>
+    <item msgid="3863339891188103437">"Každých 15 minút"</item>
+    <item msgid="6868848414437854609">"Vypnuté"</item>
   </string-array>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ac70bba..3e5dd72 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Enkrat"</item>
     <item msgid="9097229303902157183">"Vsaki 2 minuti"</item>
-    <item msgid="5676933700148002666">"Vsakih 15 minut"</item>
-    <item msgid="694355015442188708">"Izklopljeno"</item>
+    <item msgid="5718214950343391480">"Vsakih 5 minut"</item>
+    <item msgid="3863339891188103437">"Vsakih 15 minut"</item>
+    <item msgid="6868848414437854609">"Izklopljeno"</item>
   </string-array>
 </resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 98%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
index d0f91fa..ac3fdb0 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Një herë"</item>
     <item msgid="9097229303902157183">"Çdo 2 minuta"</item>
-    <item msgid="5676933700148002666">"Çdo 15 minuta"</item>
-    <item msgid="694355015442188708">"Çaktivizuar"</item>
+    <item msgid="5718214950343391480">"Çdo 5 minuta"</item>
+    <item msgid="3863339891188103437">"Çdo 15 minuta"</item>
+    <item msgid="6868848414437854609">"Joaktiv"</item>
   </string-array>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index cd5f1d7..33239c7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -77,7 +77,7 @@
     <string name="cmas_category_fire" msgid="3331981591918341119">"Пожар"</string>
     <string name="cmas_category_health" msgid="312569774587117324">"Здравствена"</string>
     <string name="cmas_category_env" msgid="9213088574227522961">"Еколошка"</string>
-    <string name="cmas_category_transport" msgid="5014901635987361642">"Транспорт"</string>
+    <string name="cmas_category_transport" msgid="5014901635987361642">"Превоз"</string>
     <string name="cmas_category_infra" msgid="3558151044446851398">"Инфраструктура"</string>
     <string name="cmas_category_cbrne" msgid="240421557913603971">"Хемијска/биолошка/нуклеарна/експлозивна"</string>
     <string name="cmas_category_other" msgid="6158932360790744360">"Друго"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Једанпут"</item>
     <item msgid="9097229303902157183">"Свака 2 минута"</item>
-    <item msgid="5676933700148002666">"Сваких 15 минута"</item>
-    <item msgid="694355015442188708">"Искључено"</item>
+    <item msgid="5718214950343391480">"Сваких 5 минута"</item>
+    <item msgid="3863339891188103437">"Сваких 15 минута"</item>
+    <item msgid="6868848414437854609">"Искључено"</item>
   </string-array>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 05766ff..257a009 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"En gång"</item>
     <item msgid="9097229303902157183">"Varannan minut"</item>
-    <item msgid="5676933700148002666">"Var 15:e minut"</item>
-    <item msgid="694355015442188708">"Av"</item>
+    <item msgid="5718214950343391480">"Var 5:e minut"</item>
+    <item msgid="3863339891188103437">"Var 15:e minut"</item>
+    <item msgid="6868848414437854609">"Av"</item>
   </string-array>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 36a4f20..5a4d2ab 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"Mipangilio ya Matangazo ya simu"</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 arifu amilifu katika eneo lako. Unaweza kubadilisha mipangilio ya Arifu kwa kutumia chaguo la menyu ya Mipangilio."</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>
     <string name="menu_preferences" msgid="3596514894131599202">"Mipangilio"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Futa matangazo"</string>
     <string name="message_options" msgid="3178489901903589574">"Chaguo za ujumbe"</string>
@@ -39,7 +39,7 @@
     <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Arifa ya Rais"</string>
     <string name="cmas_extreme_alert" msgid="2588720613319969289">"Arifa ya Dharura: Kabisa"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"Arifa ya dharura: Kali"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"Utekaji nyara wa Mtoto (arifa ya AMBER)"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"Utekaji nyara Watoto (arifa za AMBER)"</string>
     <string name="cmas_required_monthly_test" msgid="6464047268150108932">"Jaribio la kila mwezi la arifa ya dharura"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"Arifa ya Dharura (Zoezi)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Arifa ya dharura (mtoa huduma)"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Mara moja"</item>
     <item msgid="9097229303902157183">"Kila baada ya dakika 2"</item>
-    <item msgid="5676933700148002666">"Kila baada ya dakika 15"</item>
-    <item msgid="694355015442188708">"Zimezimwa"</item>
+    <item msgid="5718214950343391480">"Kila baada ya dakika 5"</item>
+    <item msgid="3863339891188103437">"Kila baada ya dakika 15"</item>
+    <item msgid="6868848414437854609">"Imezimwa"</item>
   </string-array>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml
similarity index 98%
rename from res/values-ta-rIN/strings.xml
rename to res/values-ta/strings.xml
index eb84693..6434813 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ஒருமுறை மட்டும்"</item>
     <item msgid="9097229303902157183">"2 நிமிடங்களுக்கு ஒருமுறை"</item>
-    <item msgid="5676933700148002666">"15 நிமிடங்களுக்கு ஒருமுறை"</item>
-    <item msgid="694355015442188708">"முடக்கு"</item>
+    <item msgid="5718214950343391480">"5 நிமிடங்களுக்கு ஒருமுறை"</item>
+    <item msgid="3863339891188103437">"15 நிமிடங்களுக்கு ஒருமுறை"</item>
+    <item msgid="6868848414437854609">"முடக்கு"</item>
   </string-array>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
similarity index 98%
rename from res/values-te-rIN/strings.xml
rename to res/values-te/strings.xml
index 72086fe..0fdb931 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ఒకసారి"</item>
     <item msgid="9097229303902157183">"ప్రతి 2 నిమిషాలకు"</item>
-    <item msgid="5676933700148002666">"ప్రతి 15 నిమిషాలకు"</item>
-    <item msgid="694355015442188708">"ఆపివేయబడింది"</item>
+    <item msgid="5718214950343391480">"ప్రతి 5 నిమిషాలకు"</item>
+    <item msgid="3863339891188103437">"ప్రతి 15 నిమిషాలకు"</item>
+    <item msgid="6868848414437854609">"ఆఫ్ చేయి"</item>
   </string-array>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 93cd52f..ca1ab73 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"การตั้งค่าการส่งข้อมูลเตือนภัยทางมือถือ"</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>
+    <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>
@@ -48,7 +48,7 @@
     <string name="emergency_alert_settings_title" msgid="5427868392642771940">"การตั้งค่าการแจ้งเตือนฉุกเฉิน"</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="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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"หนึ่งครั้ง"</item>
     <item msgid="9097229303902157183">"ทุก 2 นาที"</item>
-    <item msgid="5676933700148002666">"ทุก 15 นาที"</item>
-    <item msgid="694355015442188708">"ปิด"</item>
+    <item msgid="5718214950343391480">"ทุก 5 นาที"</item>
+    <item msgid="3863339891188103437">"ทุก 15 นาที"</item>
+    <item msgid="6868848414437854609">"ปิด"</item>
   </string-array>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 5a5f160..bd953ba 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -20,16 +20,16 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"Mga setting ng Cell Broadcast"</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 iyong lugar. Mababago mo ang mga setting ng Alerto gamit ang pagpipilian ng menu ng Mga Setting."</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>
     <string name="menu_preferences" msgid="3596514894131599202">"Mga Setting"</string>
-    <string name="menu_delete_all" msgid="3940997343921149800">"Tanggalin ang mga broadcast"</string>
+    <string name="menu_delete_all" msgid="3940997343921149800">"I-delete ang mga broadcast"</string>
     <string name="message_options" msgid="3178489901903589574">"Mga pagpipilian sa mensahe"</string>
     <string name="menu_view_details" msgid="1040989019045280975">"Tingnan ang mga detalye"</string>
-    <string name="menu_delete" msgid="128380070910799366">"Tanggalin ang broadcast"</string>
+    <string name="menu_delete" msgid="128380070910799366">"I-delete ang broadcast"</string>
     <string name="view_details_title" msgid="1780427629491781473">"Mga detalye ng alerto"</string>
-    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Tanggalin ang broadcast na ito?"</string>
-    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Tanggalin ang lahat ng natanggap na broadcast na mensahe?"</string>
-    <string name="button_delete" msgid="4672451757925194350">"Tanggalin"</string>
+    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"I-delete ang broadcast na ito?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"I-delete ang lahat ng natanggap na broadcast na mensahe?"</string>
+    <string name="button_delete" msgid="4672451757925194350">"I-delete"</string>
     <string name="button_cancel" msgid="7479958360523246140">"Kanselahin"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"Babala sa lindol"</string>
     <string name="etws_tsunami_warning" msgid="6173964105145900312">"Babala sa tsunami"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Isang beses"</item>
     <item msgid="9097229303902157183">"Bawat 2 minuto"</item>
-    <item msgid="5676933700148002666">"Bawat 15 minuto"</item>
-    <item msgid="694355015442188708">"I-off"</item>
+    <item msgid="5718214950343391480">"Bawat 5 minuto"</item>
+    <item msgid="3863339891188103437">"Bawat 15 minuto"</item>
+    <item msgid="6868848414437854609">"Naka-off"</item>
   </string-array>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e92a415..59f4227 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Bir defa"</item>
     <item msgid="9097229303902157183">"2 dakikada bir"</item>
-    <item msgid="5676933700148002666">"15 dakikada bir"</item>
-    <item msgid="694355015442188708">"Kapalı"</item>
+    <item msgid="5718214950343391480">"5 dakikada bir"</item>
+    <item msgid="3863339891188103437">"15 dakikada bir"</item>
+    <item msgid="6868848414437854609">"Kapalı"</item>
   </string-array>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index aa46321..2fd8f5c 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/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="7559008249836700599">"Cell Broadcasts"</string>
+    <string name="app_label" msgid="7559008249836700599">"Сповіщення оператора"</string>
     <string name="sms_cb_settings" msgid="971917159442705371">"Налаштування Cell Broadcast"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Налаштування широкомовних інформаційних повідомлень недоступні для цього користувача"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Один раз"</item>
     <item msgid="9097229303902157183">"Кожні 2 хвилини"</item>
-    <item msgid="5676933700148002666">"Кожні 15 хвилин"</item>
-    <item msgid="694355015442188708">"Вимкнено"</item>
+    <item msgid="5718214950343391480">"Кожні 5 хвилин"</item>
+    <item msgid="3863339891188103437">"Кожні 15 хвилин"</item>
+    <item msgid="6868848414437854609">"Вимкнено"</item>
   </string-array>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml
similarity index 98%
rename from res/values-ur-rPK/strings.xml
rename to res/values-ur/strings.xml
index b40f78c..58ec0c5 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ایک بار"</item>
     <item msgid="9097229303902157183">"ہر 2 منٹ پر"</item>
-    <item msgid="5676933700148002666">"ہر 15 منٹ پر"</item>
-    <item msgid="694355015442188708">"آف"</item>
+    <item msgid="5718214950343391480">"ہر 5 منٹ میں"</item>
+    <item msgid="3863339891188103437">"ہر 15 منٹ میں"</item>
+    <item msgid="6868848414437854609">"آف"</item>
   </string-array>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml
similarity index 96%
rename from res/values-uz-rUZ/strings.xml
rename to res/values-uz/strings.xml
index 610a474..9494b0f 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"Aholini ogohlantirish sozlamalari"</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">"Hududingizda faol ogohlantirishlar yo‘q. Ogohlantirish sozlamalarini Sozlamalar menyusi orqali o‘zgartirishingiz mumkin."</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>
     <string name="menu_preferences" msgid="3596514894131599202">"Sozlamalar"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Tarqatma xabarlarni o‘chirish"</string>
     <string name="message_options" msgid="3178489901903589574">"Xabar sozlamalari"</string>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Bir marta"</item>
     <item msgid="9097229303902157183">"Har 2 daqiqada"</item>
-    <item msgid="5676933700148002666">"Har 15 daqiqada"</item>
-    <item msgid="694355015442188708">"O‘chirib qo‘yish"</item>
+    <item msgid="5718214950343391480">"Har 5 daqiqada"</item>
+    <item msgid="3863339891188103437">"Har 15 daqiqada"</item>
+    <item msgid="6868848414437854609">"O‘chiq"</item>
   </string-array>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d1f360c..cb61dd7 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -110,7 +110,8 @@
   <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>
-    <item msgid="5676933700148002666">"15 phút một lần"</item>
-    <item msgid="694355015442188708">"Tắt"</item>
+    <item msgid="5718214950343391480">"5 phút một lần"</item>
+    <item msgid="3863339891188103437">"15 phút một lần"</item>
+    <item msgid="6868848414437854609">"Tắt"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d1333bf..8df79c8 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -36,7 +36,7 @@
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"地震海啸警报"</string>
     <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_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>
@@ -102,7 +102,7 @@
     <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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"1次"</item>
     <item msgid="9097229303902157183">"每隔2分钟"</item>
-    <item msgid="5676933700148002666">"每隔15分钟"</item>
-    <item msgid="694355015442188708">"关闭"</item>
+    <item msgid="5718214950343391480">"每隔 5 分钟"</item>
+    <item msgid="3863339891188103437">"每隔 15 分钟"</item>
+    <item msgid="6868848414437854609">"关闭"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index a824a89..5bcbee0 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"區域廣播設定"</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>
@@ -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>
@@ -100,9 +100,9 @@
     <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" 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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"一次"</item>
     <item msgid="9097229303902157183">"每 2 分鐘提醒一次"</item>
-    <item msgid="5676933700148002666">"每 15 分鐘提醒一次"</item>
-    <item msgid="694355015442188708">"關閉"</item>
+    <item msgid="5718214950343391480">"每 5 分鐘"</item>
+    <item msgid="3863339891188103437">"每 15 分鐘"</item>
+    <item msgid="6868848414437854609">"關閉"</item>
   </string-array>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 0fdbbf2..9f57d40 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -36,11 +36,11 @@
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"地震與海嘯警告"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"ETWS 測試訊息"</string>
     <string name="etws_other_emergency_type" msgid="5233080551309721499">"緊急警告"</string>
-    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"總統級警示"</string>
-    <string name="cmas_extreme_alert" msgid="2588720613319969289">"緊急警示:極嚴重"</string>
+    <string name="cmas_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_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>
@@ -59,7 +59,7 @@
     <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_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>
@@ -102,7 +102,7 @@
     <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>
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"一次"</item>
     <item msgid="9097229303902157183">"每隔 2 分鐘"</item>
-    <item msgid="5676933700148002666">"每隔 15 分鐘"</item>
-    <item msgid="694355015442188708">"關閉"</item>
+    <item msgid="5718214950343391480">"每 5 分鐘"</item>
+    <item msgid="3863339891188103437">"每 15 分鐘"</item>
+    <item msgid="6868848414437854609">"關閉"</item>
   </string-array>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 1548c0b..abaf281 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -110,7 +110,8 @@
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Kanye"</item>
     <item msgid="9097229303902157183">"Njalo kumaminithi angu-2"</item>
-    <item msgid="5676933700148002666">"Njalo kumaminithi angu-15"</item>
-    <item msgid="694355015442188708">"Valiwe"</item>
+    <item msgid="5718214950343391480">"Njalo ngamaminithi angu-5"</item>
+    <item msgid="3863339891188103437">"Njalo ngamaminithi angu-15"</item>
+    <item msgid="6868848414437854609">"Valiwe"</item>
   </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1d4f147..bc8fc1b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -88,6 +88,8 @@
 
     <!-- Preference category title for emergency alert settings. [CHAR LIMIT=50] -->
     <string name="emergency_alert_settings_title">Emergency alert settings</string>
+    <!-- Notification channel name for a channel containing cell broadcast messages notifications. [CHAR LIMIT=30] -->
+    <string name="notification_channel_broadcast_messages">Broadcast messages</string>
     <!-- Preference title for enable emergency alerts checkbox. [CHAR LIMIT=30] -->
     <string name="enable_emergency_alerts_title">Turn on notifications</string>
     <!-- Preference summary for enable notifications checkbox. [CHAR LIMIT=50] -->
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
index c07ab85..f7efbf0 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastAlertService.java
@@ -18,8 +18,9 @@
 
 import static android.text.format.DateUtils.DAY_IN_MILLIS;
 
-import android.app.ActivityManagerNative;
+import android.app.ActivityManager;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
@@ -71,6 +72,12 @@
     /** Use the same notification ID for non-emergency alerts. */
     static final int NOTIFICATION_ID = 1;
 
+    /**
+     * Notification channel containing all cellbroadcast broadcast messages notifications.
+     * Use the same notification channel for non-emergency alerts.
+     */
+    static final String NOTIFICATION_CHANNEL_BROADCAST_MESSAGES = "broadcastMessages";
+
     /** Sticky broadcast for latest area info broadcast received. */
     static final String CB_AREA_INFO_RECEIVED_ACTION =
             "android.cellbroadcastreceiver.CB_AREA_INFO_RECEIVED";
@@ -154,7 +161,7 @@
         } else if (SHOW_NEW_ALERT_ACTION.equals(action)) {
             try {
                 if (UserHandle.myUserId() ==
-                        ActivityManagerNative.getDefault().getCurrentUser().id) {
+                        ActivityManager.getService().getCurrentUser().id) {
                     showNewAlert(intent);
                 } else {
                     Log.d(TAG,"Not active user, ignore the alert display");
@@ -566,6 +573,8 @@
         int channelTitleId = CellBroadcastResources.getDialogTitleResource(context, message);
         CharSequence channelName = context.getText(channelTitleId);
         String messageBody = message.getMessageBody();
+        final NotificationManager notificationManager = NotificationManager.from(context);
+        createNotificationChannels(context);
 
         // Create intent to show the new messages when user selects the notification.
         Intent intent;
@@ -590,7 +599,8 @@
         }
 
         // use default sound/vibration/lights for non-emergency broadcasts
-        Notification.Builder builder = new Notification.Builder(context)
+        Notification.Builder builder = new Notification.Builder(
+                context, NOTIFICATION_CHANNEL_BROADCAST_MESSAGES)
                 .setSmallIcon(R.drawable.ic_notify_alert)
                 .setTicker(channelName)
                 .setWhen(System.currentTimeMillis())
@@ -618,11 +628,21 @@
             builder.setContentTitle(channelName).setContentText(messageBody);
         }
 
-        NotificationManager notificationManager = NotificationManager.from(context);
-
         notificationManager.notify(NOTIFICATION_ID, builder.build());
     }
 
+    /**
+     * Creates the notification channel and registers it with NotificationManager. If a channel
+     * with the same ID is already registered, NotificationManager will ignore this call.
+     */
+    static void createNotificationChannels(Context context) {
+        NotificationManager.from(context).createNotificationChannel(
+                new NotificationChannel(
+                NOTIFICATION_CHANNEL_BROADCAST_MESSAGES,
+                context.getString(R.string.notification_channel_broadcast_messages),
+                NotificationManager.IMPORTANCE_LOW));
+    }
+
     static Intent createDisplayMessageIntent(Context context, Class intentClass,
             ArrayList<CellBroadcastMessage> messageList) {
         // Trigger the list activity to fire up a dialog that shows the received messages
diff --git a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
index dcb4b14..477e8be 100644
--- a/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
+++ b/src/com/android/cellbroadcastreceiver/CellBroadcastReceiver.java
@@ -110,6 +110,9 @@
             } else {
                 loge("ignoring unprivileged action received " + action);
             }
+        } else if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
+            // rename registered notification channels on locale change
+            CellBroadcastAlertService.createNotificationChannels(context);
         } else {
             Log.w(TAG, "onReceive() unexpected action " + action);
         }
diff --git a/tests/res/values-be/strings.xml b/tests/res/values-be/strings.xml
new file mode 100644
index 0000000..6c4dcfc
--- /dev/null
+++ b/tests/res/values-be/strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2102435118079140813">"Тэсты мабільнага вяшчання"</string>
+    <string name="button_etws_normal_type" msgid="3852703138521119537">"Адправіць нармальнае вяшчанне СПЗЦ"</string>
+    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Адправіць адмену вяшчання СПЗЦ"</string>
+    <string name="button_etws_test_type" msgid="6353906188028139901">"Адправіць тэставае вяшчанне СПЗЦ"</string>
+    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Адправіць прэзідэнцкую абвестку CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Адправіць экстрэмальную абвестку CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Адправіць сур\'ёзную абвестку CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Адправіць АРАНЖАВУЮ абвестку CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Адправіць штомесячную тэставую абвестку CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Адправіць выпрабаванне вяшчання GSM 7 біт"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Адправіць выпрабаванне вяшчання UMTS 7 біт"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Адправіць вяшчанне поўнай даўжыні GSM 7 біт"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Адправіць вяшчанне поўнай даўжыні UMTS 7 біт"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Адправіць многастароначнае вяшчанне GSM 7 біт"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Адправіць многастароначнае вяшчанне UMTS 7 біт"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Адправіць GSM 7 біт на мове"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Адправіць GSM 7 біт з мовай у асноўнай частцы"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Адправіць UMTS 7 біт на мове"</string>
+    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Адправіць выпрабаванне вяшчання GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Адправіць выпрабаванне вяшчання UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Адправіць многастароначнае вяшчанне UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Адправіць GSM UCS-2 на мове"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Адправіць UMTS UCS-2 на мове"</string>
+    <string name="button_delay_broadcast" msgid="5138650276363839541">"Затрымка 5 секунд перад адпраўкай"</string>
+    <string name="message_id_label" msgid="4365322663037110887">"Ідэнтыфікатар паведамлення:"</string>
+    <string name="category_id_label" msgid="8472814003810180738">"Катэгорыя:"</string>
+</resources>
diff --git a/tests/testapp/res/values-af/strings.xml b/tests/testapp/res/values-af/strings.xml
index 4279e6c..2ed9853 100644
--- a/tests/testapp/res/values-af/strings.xml
+++ b/tests/testapp/res/values-af/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Seluitsaaitoetse"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Stuur ETWS-normaaluitsending"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Stuur ETWS-kansellasie-uitsending"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Stuur ETWS-toetsuitsending"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Stuur CMAS se presidensiële berig"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Stuur CMAS se uiterste berig"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Stuur CMAS se ernstige berig"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Stuur CMAS AMBER-berig"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Stuur CMAS se maandelikse toetsberig"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Stuur GSM-7-bis-toetsuitsending"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Stuur UMTS-7-bis-toetuitsending"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Stuur GSM-7-bis-vollengte-uitsending"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Stuur UMTS-7-bis-vollengte-uitsending"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Stuur GSM-7-bis-multibladsy-uitsending"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Stuur UMTS-7-bis-multibladsy-uitsending"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Stuur GSM-7-bis met taal"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Stuur GSM-7-bis met taal in lyf"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Stuur UMTS-7-bis met taal"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Stuur GSM-UCS-2-toetsuitsending"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Stuur UMTS-UCS-2-toetsuitsending"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Stuur UMTS-UCS-2-multibladsy-uitsending"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Stuur GSM-UCS-2 met taal"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Stuur UMTS-UC-2 met taal"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Vertraag met 5 sekondes voordat gestuur word"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Boodskap-ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorie:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Seluitsendingtoetse"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Stuur ETWS-aardbewinguitsending"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Stuur ETWS-tsoenami-uitsending"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Stuur ETWS-aardbewing-en-tsoenami-uitsending"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Stuur ander ETWS-nooduitsending"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Stuur ETWS-kansellasie-uitsending"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Stuur ETWS-toetsuitsending"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Stuur presidensiële waarskuwing deur CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Stuur uiterste waarskuwing deur CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Stuur ernstige waarskuwing deur CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Stuur AMBER-waarskuwing deur CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Stuur maandelikse toetswaarskuwing deur CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Stuur GSM-7-bis-toetsuitsending"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Stuur UMTS-7-bis-toetuitsending"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Stuur GSM-7-bis-vollengte-uitsending"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Stuur UMTS-7-bis-vollengte-uitsending"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Stuur GSM-7-bis-multibladsy-uitsending"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Stuur UMTS-7-bis-multibladsy-uitsending"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Stuur GSM-7-bis met taal"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Stuur GSM-7-bis met taal in inhoud"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Stuur UMTS-7-bis met taal"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Stuur GSM-UCS-2-toetsuitsending"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Stuur UMTS-UCS-2-toetsuitsending"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Stuur UMTS-UCS-2-multibladsy-uitsending"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Stuur GSM-UCS-2 met taal"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Stuur UMTS-UC-2 met taal"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Wag 5 sekondes voordat dit gestuur word"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Boodskap-ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorie:"</string>
 </resources>
diff --git a/tests/testapp/res/values-am/strings.xml b/tests/testapp/res/values-am/strings.xml
index 8a28f63..4506ff6 100644
--- a/tests/testapp/res/values-am/strings.xml
+++ b/tests/testapp/res/values-am/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"የስልክ የስርጭት ሙከራዎች"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Send ETWS Normal Broadcast"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"የETWS ስርጭት ላክ ይቅር"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS  የሙከራ  ስርጭት ላክ"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS የፕሬዝደንታዊ ማንቂያ ላክ"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"የCMAS ከባድ ማንቂያዎችን ላክ"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS የሃይለኛ ሁኔታ ማንቂያዎችን ላክ"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"የCMAS እገታ ማንቂያዎችን ላክ"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS ወርሃዊ የሙከራ ማንቂያ ላክ"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 Bit የሙከራ  ስርጭት ላክ"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 Bit  የቡከራ  ስርጭት  ላክ"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 Bit  በሙሉ ርዝመት ማሰራጨት ላክ"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 Bit በሙሉ የስርጭት  ርዝመት  ላክ"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 Bit  በብዙ ገጽ  ስርጭት ላክ"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 Bit በብዙ ገጽ ስርጭት ላክ"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">" GSM 7 Bit  በቋንቋ  ላክ"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM 7 Bit በቋንቋ አካል ውስጥ ላክ"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 Bit በቋንቋ  ላክ"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2  የሙከራ ስርጭት ላክ"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 የሙከራ  ስርጭት ላክ"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 በብዙ ገጽ ስርጭት ላክ"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">" GSM UCS-2  በቋንቋ  ላከ"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2  በቋንቋ ላክ"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"ከመላኩ በፊት 5 ሰከንዶች አዘግይ"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"የመልዕክት መታወቂያ፦"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"ምድብ፦"</string>
+    <string name="app_label" msgid="2704349695846064655">"የስልክ የስርጭት ሙከራዎች"</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>
+    <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_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 AMBER ማንቂያዎችን ላክ"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"የCMAS ወርሃዊ የሙከራ ማንቂያ ላክ"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"የGSM 7 ቢት የሙከራ ስርጭት ላክ"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"የUMTS 7 ቢት ሙከራ ስርጭት ላክ"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"የGSM 7 ቢት ሙሉ ርዝመት ስርጭት ላክ"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"የUMTS 7 ቢት ሙሉ የስርጭት ርዝመት ላክ"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"የGSM 7 ቢት ብዙ-ገጽ ስርጭት ላክ"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"የUMTS 7 ቢት ብዙ-ገጽ ስርጭት ላክ"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"የGSM 7 ቢት ከቋንቋ ጋር ላክ"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"የGSM 7 ቢት ከቋንቋ ውስጥ አካል ጋር ላክ"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"የUMTS 7 ቢት ከቋንቋ ጋር ላክ"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"የGSM UCS-2 ሙከራ ስርጭት ላክ"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"የUMTS UCS-2 ሙከራ ስርጭት ላክ"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"የUMTS UCS-2 ብዙ-ገጽ ስርጭት ላክ"</string>
+    <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">"ከመላኩ በፊት 5 ሰከንዶች አዘግይ"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"የመልዕክት መታወቂያ፦"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"ምድብ፦"</string>
 </resources>
diff --git a/tests/testapp/res/values-ar/strings.xml b/tests/testapp/res/values-ar/strings.xml
index c4fe89d..0073813 100644
--- a/tests/testapp/res/values-ar/strings.xml
+++ b/tests/testapp/res/values-ar/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"‏اختبارات Cell Broadcasts"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"‏إرسال بث ETWS عادي"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"‏إرسال بث إلغاء لـ ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"‏إرسال بث تجريبي لـ ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"‏إرسال تنبيه رئاسي CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"‏إرسال تنبيه CMAS ذي خطورة قصوى"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"‏إرسال تنبيه CMAS ذي خطورة بالغة"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"‏إرسال تنبيه CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"‏إرسال تنبيه اختبار شهري CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"‏إرسال بث تجريبي لنظام GSM ‏7 بت"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"‏إرسال بث تجريبي لكود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏7 بت"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"‏إرسال بث طويل لنظام GSM ‏7 بت"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"‏إرسال بث طويل للنظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏7 بت"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"‏إرسال بث متعدد الصفحات لكود نظام GSM ‏7 بت"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"‏إرسال بث متعدد الصفحات لكود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏7 بت"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"‏إرسال كود نظام GSM ‏7 بت مع اللغة"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"‏إرسال كود نظام GSM 7 بت مع اللغة ضمن النص"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"‏إرسال كود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏7 بت مع اللغة"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"‏إرسال بث تجريبي لنظام GSM ‏UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"‏إرسال بث تجريبي لكود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"‏إرسال بث متعدد الصفحات لكود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"‏إرسال كود GSM UCS-2 مع اللغة"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"‏إرسال كود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏UCS-2 مع اللغة"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"التأخير 5 ثوانٍ قبل الإرسال"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"معرف الرسالة:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"الفئة:"</string>
+    <string name="app_label" msgid="2704349695846064655">"اختبارات البث الخلوي"</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>
+    <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_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 AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"‏إرسال تنبيه اختبار شهري CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"‏إرسال بث تجريبي لنظام GSM ‏٧ بت"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"‏إرسال بث تجريبي لكود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏٧ بت"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"‏إرسال بث طويل لنظام GSM ۷ بت"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"‏إرسال بث طويل للنظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏۷ بت"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"‏إرسال بث متعدد الصفحات لكود نظام GSM ‏٧ بت"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"‏إرسال بث متعدد الصفحات لكود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ٧ بت"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"‏إرسال كود نظام GSM ‏٧ بت مع اللغة"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"‏إرسال كود نظام GSM ٧ بت مع اللغة ضمن النص"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"‏إرسال كود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏٧ بت مع اللغة"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"‏إرسال بث تجريبي لنظام GSM ‏UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"‏إرسال بث تجريبي لكود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"‏إرسال بث متعدد الصفحات لكود النظام العالمي لاتصالات الجوال عن بعد (UMTS) ‏UCS-2"</string>
+    <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">"معرف الرسالة:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"الفئة:"</string>
 </resources>
diff --git a/tests/testapp/res/values-az-rAZ/strings.xml b/tests/testapp/res/values-az-rAZ/strings.xml
deleted file mode 100644
index c95ba00..0000000
--- a/tests/testapp/res/values-az-rAZ/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Şəbəkə Yayım Testləri"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS Normal Yayımını Göndərin"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS Ləğv Yayımını Göndərin"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS Test Yayımını Göndərin"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS Prezident Siqnalı Göndərin"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS Ekstremal Siqnal Göndərin"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS Ağır Siqnal Göndərin"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER Siqnalı Göndərin"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS Aylıq Test Siqnalı Göndərin"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 Bit Test Yayımını Göndərin"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 Bit Test Yayımını Göndərin"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 Bit Tam Uzunluqda Yayım Göndərin"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 Bit Tam Uzunluqda Yayım Göndərin"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 Bit Multi Səhifə Yayımını Göndərin"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 Bit Multi Səhifə Yayımını Göndərin"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 Bit Dil ilə Göndərin"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM 7 Bit Bədən Dili ilə Göndərin"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 Bit Dil ilə Göndərin"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 Test Yayımını Göndərin"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 Test Yayımını Göndərin"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 Multi Səhifə Yayımını Göndərin"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 Dil ilə Göndərin"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 Dil ilə Göndərin"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Göndərmədən öncə 5 saniyə gözləyin"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Mesaj ID\'si:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kateqoriya:"</string>
-</resources>
diff --git a/tests/testapp/res/values-az/strings.xml b/tests/testapp/res/values-az/strings.xml
new file mode 100644
index 0000000..de68d1c
--- /dev/null
+++ b/tests/testapp/res/values-az/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Şəbəkə Yayım Testləri"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"ETWS Zəlzələ Yayımını göndərin"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"ETWS Sunami Yayımını göndərin"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"ETWS Zəlzələ və Sunami Yayımını göndərin"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Zəlzələ və tsunami haqqında xəbərdarlıq edən digər bildiriş sistemlərini göndərin"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"ETWS Ləğv Yayımını Göndərin"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"ETWS Test Yayımını Göndərin"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"CMAS Prezident Siqnalı Göndərin"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"CMAS Ekstremal Siqnal Göndərin"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"CMAS Ağır Siqnal Göndərin"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"CMAS AMBER Siqnalı Göndərin"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS Aylıq Test Siqnalı Göndərin"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 Bit Test Yayımını Göndərin"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 Bit Test Yayımını Göndərin"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 Bit Tam Uzunluqda Yayım Göndərin"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 Bit Tam Uzunluqda Yayım Göndərin"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 Bit Multi Səhifə Yayımını Göndərin"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 Bit Multi Səhifə Yayımını Göndərin"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7 Bit Dil ilə Göndərin"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"GSM 7 Bit Bədən Dili ilə Göndərin"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7 Bit Dil ilə Göndərin"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 Test Yayımını Göndərin"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 Test Yayımını Göndərin"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 Multi Səhifə Yayımını Göndərin"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"GSM UCS-2 Dil ilə Göndərin"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"UMTS UCS-2 Dil ilə Göndərin"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Göndərmədən öncə 5 saniyə gözləyin"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Mesaj ID\'si:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kateqoriya:"</string>
+</resources>
diff --git a/tests/testapp/res/values-b+sr+Latn/strings.xml b/tests/testapp/res/values-b+sr+Latn/strings.xml
index b136cfc..ac7b689 100644
--- a/tests/testapp/res/values-b+sr+Latn/strings.xml
+++ b/tests/testapp/res/values-b+sr+Latn/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Testiranja info servisa"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Pošalji normalno ETWS emitovanje"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Pošalji ETWS emitovanje za otkazivanje"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Pošalji probno ETWS emitovanje"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Pošalji CMAS predsedničko upozorenje"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Pošalji CMAS upozorenje o ekstremnoj opasnosti"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Pošalji CMAS obaveštenje o ozbiljnoj opasnosti"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Pošalji CMAS AMBER upozorenje"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Pošalji CMAS mesečno probno upozorenje"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Pošalji 7-bitno probno GSM emitovanje"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Pošalji 7-bitno probno UMTS emitovanje"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Pošalji celokupno 7-bitno GSM emitovanje"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Pošalji celokupno 7-bitno UMTS emitovanje"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Pošalji 7-bitno GSM emitovanje na više strana"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Pošalji 7-bitno UMTS emitovanje na više strana"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Pošalji 7-bitni GSM sa jezikom"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Pošalji 7-bitni  GSM sa jezikom u telu poruke"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Pošalji 7-bitni UMTS sa jezikom"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Pošalji GSM UCS-2 probno emitovanje"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Pošalji probno UMTS UCS-2 emitovanje"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Pošalji UMTS UCS-2 emitovanje na više strana"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Pošalji GSM UCS-2 sa jezikom"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Pošalji UMTS UCS-2 sa jezikom"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Kašnjenje od pet sekundi pre slanja"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID poruke:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorija:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Testiranja info servisa"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Pošalji ETWS upozorenje o zemljotresu"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Pošalji ETWS upozorenje o cunamiju"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Pošalji ETWS upozorenje o zemljotresu i cunamiju"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Pošalji ETWS upozorenje o drugom hitnom slučaju"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Pošalji ETWS emitovanje za otkazivanje"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Pošalji probno ETWS emitovanje"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Pošalji CMAS predsedničko upozorenje"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Pošalji CMAS upozorenje o ekstremnoj opasnosti"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Pošalji CMAS obaveštenje o ozbiljnoj opasnosti"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Pošalji CMAS AMBER upozorenje"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Pošalji CMAS mesečno probno upozorenje"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Pošalji 7-bitno probno GSM emitovanje"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Pošalji 7-bitno probno UMTS emitovanje"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Pošalji celokupno 7-bitno GSM emitovanje"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Pošalji celokupno 7-bitno UMTS emitovanje"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Pošalji 7-bitno GSM emitovanje na više strana"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Pošalji 7-bitno UMTS emitovanje na više strana"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Pošalji 7-bitni GSM sa jezikom"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Pošalji 7-bitni GSM sa jezikom u telu poruke"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Pošalji 7-bitni UMTS sa jezikom"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Pošalji GSM UCS-2 probno emitovanje"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Pošalji probno UMTS UCS-2 emitovanje"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Pošalji UMTS UCS-2 emitovanje na više strana"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Pošalji GSM UCS-2 sa jezikom"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Pošalji UMTS UCS-2 sa jezikom"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Kašnjenje od pet sekundi pre slanja"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID poruke:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorija:"</string>
 </resources>
diff --git a/tests/testapp/res/values-be/strings.xml b/tests/testapp/res/values-be/strings.xml
new file mode 100644
index 0000000..896a2a1
--- /dev/null
+++ b/tests/testapp/res/values-be/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Тэсты трансляцыі сеткі"</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>
+    <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_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 AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Адправіць штомесячную тэставую абвестку CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Адправіць тэставую трансляцыю GSM 7 біт"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Адправіць тэставую трансляцыю UMTS 7 біт"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Адправіць трансляцыю поўнай даўжыні GSM 7 біт"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Адправіць трансляцыю поўнай даўжыні UMTS 7 біт"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Адправіць многастароначную трансляцыю GSM 7 біт"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Адправіць многастароначную трансляцыю UMTS 7 біт"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Адправіць GSM 7 біт з мовай"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Адправіць GSM 7 біт з мовай у асноўнай частцы"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Адправіць UMTS 7 біт з мовай"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Адправіць тэставую трансляцыю GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Адправіць тэставую трансляцыю UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Адправіць многастароначную трансляцыю UMTS UCS-2"</string>
+    <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">"Затрымка 5 секунд перад адпраўкай"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Ідэнтыфікатар паведамлення:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Катэгорыя:"</string>
+</resources>
diff --git a/tests/testapp/res/values-bg/strings.xml b/tests/testapp/res/values-bg/strings.xml
index 734bc81..26778be 100644
--- a/tests/testapp/res/values-bg/strings.xml
+++ b/tests/testapp/res/values-bg/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Тестове на клетъчното излъчване"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Изпращане на нормално излъчване от системата за предупреждение за земетресения и цунами"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Изпращане на анулиращо излъчване от системата за предупреждение за земетресения и цунами"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Изпращане на тестово излъчване от системата за предупреждение за земетресения и цунами"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Изпращане на сигнал от президента чрез системата за сигнали чрез мобилните мрежи"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Изпращане на сигнал за извънредна заплаха чрез системата за сигнали чрез мобилните мрежи"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Изпращане на сигнал за сериозна заплаха чрез системата за сигнали чрез мобилните мрежи"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Изпращане на сигнал за изчезнало дете чрез системата за сигнали чрез мобилните мрежи"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Изпращане на месечен тестов сигнал чрез системата за сигнали чрез мобилните мрежи"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Изпращане на 7-битово тестово излъчване чрез GSM"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Изпращане на 7-битово тестово излъчване чрез универсална мобилна телекомуникационна услуга"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Изпращане на 7-битово пълнометражно излъчване чрез GSM"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Изпращане на 7-битово пълнометражно излъчване чрез универсална мобилна телекомуникационна услуга"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Изпращане на 7-битово излъчване в няколко страници чрез GSM"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Изпращане на 7-битово излъчване в няколко страници чрез универсална мобилна телекомуникационна услуга"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Изпращане на 7-битов SMS на даден език чрез GSM"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Изпращане на 7-битов SMS в основния текст на даден език чрез GSM"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Изпращане на 7-битов SMS на даден език чрез универсална мобилна телекомуникационна услуга"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Изпращане на тестово излъчване в UCS-2 чрез GSM"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Изпращане на тестово излъчване в UCS-2 чрез универсална мобилна телекомуникационна услуга"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Изпращане на излъчване в няколко страници в UCS-2 чрез универсална мобилна телекомуникационна услуга"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Изпращане на SMS в UCS-2 на даден език"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Изпращане на SMS в UCS-2 на даден език чрез универсална мобилна телекомуникационна услуга (UMTS)"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"5-секундно забавяне преди изпращане"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Идент. № на съобщението:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Категория:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Тестове на клетъчното излъчване"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Изпращане на излъчване от СПЗЦ за земетресение"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Изпращане на излъчване от СПЗЦ за цунами"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Изпращане на излъчване от СПЗЦ за земетресение и цунами"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Изпращане на излъчване от СПЗЦ за друга извънредна ситуация"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Изпращане на анулиращо излъчване от системата за предупреждение за земетресения и цунами"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Изпращане на тестово излъчване от системата за предупреждение за земетресения и цунами"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Изпращане на сигнал от президента чрез системата за сигнали чрез мобилните мрежи"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Изпращане на сигнал за извънредна заплаха чрез системата за сигнали чрез мобилните мрежи"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Изпращане на сигнал за сериозна заплаха чрез системата за сигнали чрез мобилните мрежи"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Изпращане на сигнал за изчезнало дете чрез системата за сигнали чрез мобилните мрежи"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Изпращане на месечен тестов сигнал чрез системата за сигнали чрез мобилните мрежи"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Изпращане на 7-битово тестово излъчване чрез GSM"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Изпращане на 7-битово тестово излъчване чрез UMTS"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Изпращане на 7-битово пълнометражно излъчване чрез GSM"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Изпращане на 7-битово пълнометражно излъчване чрез UMTS"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Изпращане на 7-битово излъчване в няколко страници чрез GSM"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Изпращане на 7-битово излъчване в няколко страници чрез UMTS"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Изпращане на 7-битов SMS на даден език чрез GSM"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Изпращане на 7-битов SMS в основния текст на даден език чрез GSM"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Изпращане на 7-битов SMS на даден език чрез UMTS"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Изпращане на тестово излъчване в UCS-2 чрез GSM"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Изпращане на тестово излъчване в UCS-2 чрез UMTS"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Изпращане на излъчване в няколко страници в UCS-2 чрез UMTS"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Изпращане на SMS в UCS-2 на даден език"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Изпращане на SMS в UCS-2 на даден език чрез UMTS"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"5-секундно забавяне преди изпращане"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Идент. № на съобщението:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Категория:"</string>
 </resources>
diff --git a/tests/testapp/res/values-bn-rBD/strings.xml b/tests/testapp/res/values-bn-rBD/strings.xml
deleted file mode 100644
index 4f83614..0000000
--- a/tests/testapp/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"সেল সম্প্রচার পরীক্ষাগুলি"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS সাধারণ সম্প্রচার পাঠান"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS বাতিল সম্প্রচার পাঠান"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS পরীক্ষা সম্প্রচার পাঠান"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS রাষ্ট্রপতি সতর্কতা পাঠান"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS চরম সতর্কতা পাঠান"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS গুরুতর সতর্কতা পাঠান"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER সতর্কতা পাঠান"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS মাসিক পরীক্ষা সতর্কতা পাঠান"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 বিট পরীক্ষা সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 বিট পরীক্ষা সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 বিট সম্পূর্ণ দৈর্ঘ্য সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 বিট সম্পূর্ণ দৈর্ঘ্য সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 বিট একাধিক পৃষ্ঠার সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 বিট একাধিক পৃষ্ঠার সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"ভাষা সহ GSM 7 বিট পাঠান"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"বিষয়বস্তুতে ভাষা সহ GSM 7 বিট পাঠান"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"ভাষা সহ UMTS 7 বিট পাঠান"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 পরীক্ষা সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 পরীক্ষা সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 একাধিক পৃষ্ঠার সম্প্রচার পাঠান"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"ভাষা সহ GSM UCS-2 পাঠান"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"ভাষা সহ UMTS UCS-2  পাঠান"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"পাঠানোর আগে ৫ সেকেন্ডের বিলম্ব"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"বার্তা ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"বিভাগ:"</string>
-</resources>
diff --git a/tests/testapp/res/values-bn/strings.xml b/tests/testapp/res/values-bn/strings.xml
new file mode 100644
index 0000000..aff1b03
--- /dev/null
+++ b/tests/testapp/res/values-bn/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"সেল ব্রডকাস্ট পরীক্ষাগুলি"</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>
+    <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_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 AMBER সতর্কতা পাঠান"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS মাসিক পরীক্ষা সতর্কতা পাঠান"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 বিট পরীক্ষা সম্প্রচার পাঠান"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 বিট পরীক্ষা সম্প্রচার পাঠান"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 বিট সম্পূর্ণ দৈর্ঘ্য সম্প্রচার পাঠান"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 বিট সম্পূর্ণ দৈর্ঘ্য সম্প্রচার পাঠান"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 বিট একাধিক পৃষ্ঠার সম্প্রচার পাঠান"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 বিট একাধিক পৃষ্ঠার সম্প্রচার পাঠান"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"ভাষা সহ GSM 7 বিট পাঠান"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"বিষয়বস্তুতে ভাষা সহ GSM 7 বিট পাঠান"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"ভাষা সহ UMTS 7 Bit With Language 7 বিট পাঠান"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 পরীক্ষা সম্প্রচার পাঠান"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 পরীক্ষা সম্প্রচার পাঠান"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 একাধিক পৃষ্ঠার সম্প্রচার পাঠান"</string>
+    <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="category_id_label" msgid="6935815032327981691">"বিভাগ:"</string>
+</resources>
diff --git a/tests/testapp/res/values-bs-rBA/strings.xml b/tests/testapp/res/values-bs-rBA/strings.xml
deleted file mode 100644
index 229f3ed..0000000
--- a/tests/testapp/res/values-bs-rBA/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Testovi mobilnih emisija"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Pošalji ETWS normalno emitovanje"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Pošalji ETWS otkaži emitovanje"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Pošalji ETWS testiraj emitovanje"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Pošalji CMAS predsjedničko upozorenje"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Pošalji CMAS ekstremno upozorenje"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Pošalji CMAS ozbiljno upozorenje"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Pošalji CMAS AMBER upozorenje"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Pošalji CMAS mjesečno testno upozorenje"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Pošalji GSM 7-bitnu testnu emisiju"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Pošalji UMTS 7-bitnu testnu emisiju"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Pošalji GSM 7-bitnu cjelokupnu emisiju"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Pošalji UMTS 7-bitnu cjelokupnu emisiju"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Pošalji GSM 7-bitnu višestruku emisiju"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Pošalji UMTS 7-bitnu višestruku emisiju"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Pošalji GSM 7-bitni sa jezikom"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Pošalji GSM 7-bitni sa jezikom u tijelu poruke"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Pošalji UMTS 7-bitni sa jezikom"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Pošalji GSM UCS-2 testnu emisiju"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Pošalji UMTS UCS-2 testnu emisiju"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Pošalji UMTS UCS-2 višestruku emisiju"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Pošalji GSM UCS-2 sa jezikom"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Pošalji UMTS UCS-2 sa jezikom"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Sačekaj 5 sekundi prije slanja"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID poruke:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorija"</string>
-</resources>
diff --git a/tests/testapp/res/values-bs/strings.xml b/tests/testapp/res/values-bs/strings.xml
new file mode 100644
index 0000000..592d5f9
--- /dev/null
+++ b/tests/testapp/res/values-bs/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="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>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Pošalji ETWS informaciju za drugu nepogodu"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Pošalji ETWS informaciju o otkazivanju"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Pošalji testnu ETWS informaciju"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Pošalji CMAS predsjedničko upozorenje"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Pošalji CMAS ekstremno upozorenje"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Pošalji CMAS ozbiljno upozorenje"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Pošalji CMAS AMBER upozorenje"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Pošalji CMAS mjesečno testno upozorenje"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Pošalji GSM 7-bitnu testnu informaciju"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Pošalji UMTS 7-bitnu testnu informaciju"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Pošalji GSM 7-bitnu potpunu informaciju"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Pošalji UMTS 7-bitnu potpunu informaciju"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Pošalji GSM 7-bitnu višestranu informaciju"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Pošalji UMTS 7-bitnu višestranu informaciju"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Pošalji GSM 7-bitnu informaciju sa jezikom"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Pošalji GSM 7-bitnu informaciju sa jezikom u tijelu poruke"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Pošalji UMTS 7-bitnu informaciju sa jezikom"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Pošalji UMTS UCS-2 testnu informaciju"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Pošalji UMTS UCS-2 testnu informaciju"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Pošalji UMTS UCS-2 višestranu informaciju"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Pošalji GSM UCS-2 informaciju sa jezikom"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Pošalji UMTS UCS-2 informaciju sa jezikom"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Sačekaj 5 sekundi prije slanja"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID poruke:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorija:"</string>
+</resources>
diff --git a/tests/testapp/res/values-ca/strings.xml b/tests/testapp/res/values-ca/strings.xml
index cf507e0..15a91fe 100644
--- a/tests/testapp/res/values-ca/strings.xml
+++ b/tests/testapp/res/values-ca/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Proves de difusió de cel·la"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Envia la difusió normal d\'ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Envia la difusió de cancel·lació d\'ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Envia la difusió de prova d\'ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Envia l\'alerta presidencial de CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Enviar l\'alerta extrema CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Envia l\'alerta important de CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Envia l\'alerta AMBER CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Envia l\'alerta de prova mensual CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Envia la difusió de prova de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Envia la difusió de prova d\'UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Envia la difusió de durada completa de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Envia la difusió de durada completa d\'UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Envia la difusió de diverses pàgines de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Envia la difusió de diverses pàgines d\'UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Envia GSM 7 Bit amb idioma"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Envia GSM 7 Bit amb idioma al cos"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Envia UMTS 7 Bit amb idioma"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Envia la difusió de prova de GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Envia la difusió de prova d\'UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Envia la difusió de diverses pàgines d\'UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Envia GSM UCS-2 amb idioma"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Envia UMTS UCS-2 amb idioma"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Retarda 5 segons abans d\'enviar"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Id. del missatge:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categoria:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Proves de difusió mòbil"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Envia la difusió de terratrèmols d\'ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Envia la difusió de tsunamis d\'ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Envia la difusió de terratrèmols i tsunamis d\'ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Envia la difusió d\'altres emergències d\'ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Envia la difusió de cancel·lació d\'ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Envia la difusió de prova d\'ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Envia l\'alerta presidencial de CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Envia l\'alerta extrema CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Envia l\'alerta important de CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Envia l\'alerta AMBER CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Envia l\'alerta de prova mensual CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Envia la difusió de prova de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Envia la difusió de prova d\'UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Envia la difusió de durada completa de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Envia la difusió de durada completa d\'UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Envia la difusió de diverses pàgines de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Envia la difusió de diverses pàgines d\'UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Envia GSM 7 Bit amb idioma"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Envia GSM 7 Bit amb idioma al cos"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Envia UMTS 7 Bit amb idioma"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Envia la difusió de prova de GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Envia la difusió de prova d\'UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Envia la difusió de diverses pàgines d\'UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Envia GSM UCS-2 amb idioma"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Envia UMTS UCS-2 amb idioma"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Retarda 5 segons abans d\'enviar"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Identificador del missatge:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categoria:"</string>
 </resources>
diff --git a/tests/testapp/res/values-cs/strings.xml b/tests/testapp/res/values-cs/strings.xml
index c363d0f..2904f24 100644
--- a/tests/testapp/res/values-cs/strings.xml
+++ b/tests/testapp/res/values-cs/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Testy zpráv informačních služeb"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Odeslat běžné zprávy systému ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Odeslat stornovací vysílání ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Odeslat testovací zprávy ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Odeslat prezidentské upozornění CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Odeslat extrémní upozornění CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Odeslat závažné upozornění CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Odeslat upozornění AMBER CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Odeslat testovací (měsíční) upozornění CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Odeslat testovací zprávy GSM (7bitové)"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Odeslat testovací zprávy UMTS (7bitové)"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Odeslat zprávy GSM (7bitové) plné délky"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Odeslat zprávy UMTS (7bitové) plné délky"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Odeslat vícestránkové zprávy  GSM (7bitové)"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Odeslat vícestránkové zprávy UMTS (7bitové)"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Odeslat vysílání GSM (7bitové) s jazykem"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Odeslat GSM 7 bitů s jazykem v těle zprávy"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Odeslat UMTS (7bitové) s jazykem"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Odeslat testovací zprávy GSM (UCS-2)"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Odeslat testovací zprávy UMTS (UCS-2)"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Odeslat vícestránkové zprávy UMTS (UCS-2)"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Odeslat GSM UCS-2 s jazykem"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Odeslat UMTS (UCS-2) s jazykem"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Před odesláním prodleva 5 sekund"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID zprávy:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorie:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Testy zpráv informačních služeb"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Odeslat zprávu ETWS ohledně zemětřesení"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Odeslat zprávu ETWS ohledně tsunami"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Odeslat zprávu ETWS ohledně zemětřesení a tsunami"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Odeslat zprávu ETWS ohledně jiného typu krizové situace"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Odeslat stornovací vysílání ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Odeslat testovací zprávy ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Odeslat prezidentské upozornění CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Odeslat extrémní upozornění CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Odeslat závažné upozornění CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Odeslat upozornění AMBER CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Odeslat testovací (měsíční) upozornění CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Odeslat testovací zprávy GSM (7bitové)"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Odeslat testovací zprávy UMTS (7bitové)"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Odeslat zprávy GSM (7bitové) plné délky"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Odeslat zprávy UMTS (7bitové) plné délky"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Odeslat vícestránkové zprávy GSM (7bitové)"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Odeslat vícestránkové zprávy UMTS (7bitové)"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Odeslat zprávy GSM (7bitové) s jazykem"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Odeslat zprávy GSM (7bitové) s jazykem v těle zprávy"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Odeslat zprávy UMTS (7bitové) s jazykem"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Odeslat testovací zprávy GSM (UCS-2)"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Odeslat testovací zprávy UMTS (UCS-2)"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Odeslat vícestránkové zprávy UMTS (UCS-2)"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Odeslat zprávy GSM UCS-2 s jazykem"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Odeslat zprávy UMTS (UCS-2) s jazykem"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Před odesláním prodleva 5 sekund"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID zprávy:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorie:"</string>
 </resources>
diff --git a/tests/testapp/res/values-da/strings.xml b/tests/testapp/res/values-da/strings.xml
index 360afda..e1a3337 100644
--- a/tests/testapp/res/values-da/strings.xml
+++ b/tests/testapp/res/values-da/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Test af Cell Broadcast-beskeder"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Send normal ETWS-meddelelse"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Send ETWS Annuller Broadcast"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Send ETWS Test Broadcast"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Send CMAS-advarsel fra præsidenten"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Send CMAS-nødalarm: Ekstrem"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Send CMAS-nødalarm: Alvorlig"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Send CMAS-advarsel om børnebortførelse"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Send CMAS-advarsel om månedlig test"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Send UMTS 7 Bit Multi Page Broadcast"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Send UMTS 7 Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Send GSM 7 Bit Full Length Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Send UMTS 7 bit i fuld længde Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Send GSM 7 Bit Multi Page Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Send UMTS 7 Bit Multi Page Broadcast"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Send GSM 7 Bit With Language"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Send GSM 7-bit med tekstens sprog"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Send UMTS 7 Bit With Language"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Send GSM UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Send UMTS UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Send UMTS UCS-2 Multi Page Broadcast"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Send GSM UCS-2 med sprog"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Send GSM UCS-2 With Language"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Vent 5 sekunder, før du sender"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Meddelelses-id:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategori:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Test af Cell Broadcast"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Send advarsel om jordskælv (ETWS)"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Send advarsel om tsunami (ETWS)"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Send advarsel om jordskælv og tsunami (ETWS)"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Send advarsel om andre katastrofer (ETWS)"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Send ETWS-annulleringsmeddelelse"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Send ETWS-testmeddelelse"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Send CMAS-advarsel fra præsidenten"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Send CMAS-advarsel: Ekstrem"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Send CMAS-advarsel: Alvorlig"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Send CMAS-advarsel om børnebortførelse"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Send CMAS-advarsel om månedlig test"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Send UMTS 7-bit testmeddelelse"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Send UMTS 7-bit testmeddelelse"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Send GSM 7-bit meddelelse i fuld længde"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Send UMTS 7-bit meddelelse i fuld længde"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Send GSM 7-bit flersidet meddelelse"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Send UMTS 7-bit flersidet meddelelse"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Send GSM 7-bit med sprog"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Send GSM 7-bit med tekstens sprog"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Send UMTS 7-bit med sprog"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Send GSM UCS-2 testmeddelelse"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Send UMTS UCS-2 testmeddelelse"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Send UMTS UCS-2 flersidet meddelelse"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Send GSM UCS-2 med sprog"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Send UMTS UCS-2 med sprog"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Vent fem sekunder, før du sender"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Meddelelses-id:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategori:"</string>
 </resources>
diff --git a/tests/testapp/res/values-de/strings.xml b/tests/testapp/res/values-de/strings.xml
index 5044d2f..c009c7c 100644
--- a/tests/testapp/res/values-de/strings.xml
+++ b/tests/testapp/res/values-de/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"CB-Tests"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Normale ETWS-Nachricht senden"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS - Abbruchnachricht senden"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS - Testnachricht senden"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS-Warnung des Präsidenten senden"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS-Warnung der Kategorie \"Extrem\" senden"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS-Warnung der Kategorie \"Schwerwiegend\" senden"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Amber Alert von CMAS senden"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Monatliche CMAS-Testwarnung senden"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 Bit - Testnachricht senden"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 Bit - Testnachricht senden"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 Bit - vollständige Nachricht senden"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 Bit - vollständige Nachricht senden"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 Bit - mehrseitige Nachricht senden"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 Bit - mehrseitige Nachrichten senden"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 Bit - mit Sprache senden"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM-Nachricht (7-Bit) mit Sprachcode im Text senden"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 Bit - mit Sprache senden"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 - Testnachricht senden"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 - Testnachricht senden"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 - mehrseitige Nachrichten senden"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 mit Sprache senden"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 - mit Sprache senden"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"5 Sekunden Verzögerung vor dem Senden"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Nachrichten-ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorie:"</string>
+    <string name="app_label" msgid="2704349695846064655">"CB-Tests"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"ETWS-Nachricht zu Erdbeben senden"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"ETWS-Nachricht zu Tsunamis senden"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"ETWS-Nachricht zu Erdbeben und Tsunamis senden"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"ETWS-Nachricht zu anderen Notfällen senden"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"ETWS – Abbruchnachricht senden"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"ETWS – Testnachricht senden"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"CMAS-Warnung des Präsidenten senden"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"CMAS-Warnung der Kategorie \"Extrem\" senden"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"CMAS-Warnung der Kategorie \"Schwerwiegend\" senden"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Amber Alert von CMAS senden"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Monatliche CMAS-Testwarnung senden"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 Bit – Testnachricht senden"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 Bit – Testnachricht senden"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 Bit – vollständige Nachricht senden"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 Bit – vollständige Nachricht senden"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 Bit – mehrseitige Nachricht senden"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 Bit – mehrseitige Nachricht senden"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7 Bit – mit Sprache senden"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"GSM-Nachricht (7-Bit) mit Sprachcode im Text senden"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7 Bit – mit Sprache senden"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 – Testnachricht senden"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 – Testnachricht senden"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 – mehrseitige Nachricht senden"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"GSM UCS-2 mit Sprache senden"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"UMTS UCS-2 – mit Sprache senden"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"5 Sekunden Verzögerung vor dem Senden"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Nachrichten-ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorie:"</string>
 </resources>
diff --git a/tests/testapp/res/values-el/strings.xml b/tests/testapp/res/values-el/strings.xml
index 65c2d8c..6fadf1f 100644
--- a/tests/testapp/res/values-el/strings.xml
+++ b/tests/testapp/res/values-el/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Δοκιμές εκπομπής κινητής τηλεφωνίας"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Αποστολή κανονικής εκπομπής ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Αποστολή μετάδοσης ETWS Cancel"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Αποστολή δοκιμαστικής μετάδοσης ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Αποστολή προεδρικών ειδοποιήσεων CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Αποστολή πολύ σοβαρών ειδοποιήσεων CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Αποστολή σοβαρών ειδοποιήσεων CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Αποστολή ειδοποιήσεων CMAS AMBER Alert"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Αποστολή μηνιαίας δοκιμαστικής μετάδοσης CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Αποστολή δοκιμαστικής μετάδοσης GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Αποστολή δοκιμαστικής μετάδοσης UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Αποστολή μετάδοσης GSM 7 Bit Full Length"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Αποστολή μετάδοσης UMTS 7 Bit Full Length"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Αποστολή μετάδοσης GSM 7 Bit Multi Page"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Αποστολή μετάδοσης UMTS 7 Bit Multi Page"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Αποστολή GSM 7 Bit With Language"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Αποστολή GSM 7 Bit συμπεριλαμβάνοντας τη γλώσσα στο σώμα του κειμένου"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Αποστολή UMTS 7 Bit With Language"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Αποστολή δοκιμαστικής μετάδοσης GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Αποστολή δοκιμαστικής μετάδοσης UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Αποστολή μετάδοσης UMTS UCS-2 Multi Page"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Αποστολή GSM UCS-2 με τη Γλώσσα"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Αποστολή UMTS UCS-2 With Language"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Καθυστέρηση 5 δευτερόλεπτα πριν από την αποστολή"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Αναγνωριστικό μηνύματος:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Κατηγορία:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Δοκιμές εκπομπής κινητής τηλεφωνίας"</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>
+    <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_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 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>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Αποστολή μετάδοσης πλήρους διάρκειας UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Αποστολή μετάδοσης GSM 7 Bit πολλών σελίδων"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Αποστολή μετάδοσης UMTS 7 Bit πολλών σελίδων"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Αποστολή GSM 7 Bit με γλώσσα"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Αποστολή GSM 7 Bit συμπεριλαμβάνοντας τη γλώσσα στο σώμα κειμένου"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Αποστολή UMTS 7 Bit με γλώσσα"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Αποστολή δοκιμαστικής μετάδοσης GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Αποστολή δοκιμαστικής μετάδοσης UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Αποστολή μετάδοσης UMTS UCS-2 πολλών σελίδων"</string>
+    <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">"Καθυστέρηση 5 δευτερόλεπτα πριν από την αποστολή"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Αναγνωριστικό μηνύματος:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Κατηγορία:"</string>
 </resources>
diff --git a/tests/testapp/res/values-en-rAU/strings.xml b/tests/testapp/res/values-en-rAU/strings.xml
index dd5e082..c421957 100644
--- a/tests/testapp/res/values-en-rAU/strings.xml
+++ b/tests/testapp/res/values-en-rAU/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Mobile Broadcast Tests"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Send ETWS Normal Broadcast"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Send ETWS Cancel Broadcast"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Send ETWS Test Broadcast"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Send CMAS Presidential Alert"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Send CMAS Extreme Alert"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Send CMAS Severe Alert"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Send CMAS AMBER Alert"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Send CMAS Monthly Test Alert"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Send GSM 7-Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Send UMTS 7-Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Send GSM 7-Bit Full-Length Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Send UMTS 7-Bit Full-Length Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Send GSM 7-Bit Multi-Page Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Send UMTS 7-Bit Multi-Page Broadcast"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Send GSM 7 Bit With Language"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Send GSM 7-Bit With Language in Body"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Send UMTS 7 Bit With Language"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Send GSM UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Send UMTS UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Send UMTS UCS-2 Multi-Page Broadcast"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Send GSM UCS-2 With Language"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Send UMTS UCS-2 With Language"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Delay 5 seconds before sending"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Message-ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Category:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Mobile Broadcast Tests"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Send ETWS Earthquake Broadcast"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Send ETWS Tsunami Broadcast"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Send ETWS Earthquake and Tsunami Broadcast"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Send ETWS Other Emergency Broadcast"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Send ETWS Cancel Broadcast"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Send ETWS Test Broadcast"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Send CMAS Presidential Alert"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Send CMAS Extreme Alert"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Send CMAS Severe Alert"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Send CMAS AMBER Alert"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Send CMAS Monthly Test Alert"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Send GSM 7-Bit Test Broadcast"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Send UMTS 7-Bit Test Broadcast"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Send GSM 7-Bit Full-Length Broadcast"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Send UMTS 7-Bit Full-Length Broadcast"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Send GSM 7-Bit Multi-Page Broadcast"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Send UMTS 7-Bit Multi-Page Broadcast"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Send GSM 7 Bit With Language"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Send GSM 7-Bit With Language in Body"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Send UMTS 7 Bit With Language"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Send GSM UCS-2 Test Broadcast"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Send UMTS UCS-2 Test Broadcast"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Send UMTS UCS-2 Multi-Page Broadcast"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Send GSM UCS-2 With Language"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Send UMTS UCS-2 With Language"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Delay 5 seconds before sending"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Message ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Category:"</string>
 </resources>
diff --git a/tests/testapp/res/values-en-rGB/strings.xml b/tests/testapp/res/values-en-rGB/strings.xml
index dd5e082..c421957 100644
--- a/tests/testapp/res/values-en-rGB/strings.xml
+++ b/tests/testapp/res/values-en-rGB/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Mobile Broadcast Tests"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Send ETWS Normal Broadcast"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Send ETWS Cancel Broadcast"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Send ETWS Test Broadcast"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Send CMAS Presidential Alert"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Send CMAS Extreme Alert"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Send CMAS Severe Alert"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Send CMAS AMBER Alert"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Send CMAS Monthly Test Alert"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Send GSM 7-Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Send UMTS 7-Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Send GSM 7-Bit Full-Length Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Send UMTS 7-Bit Full-Length Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Send GSM 7-Bit Multi-Page Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Send UMTS 7-Bit Multi-Page Broadcast"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Send GSM 7 Bit With Language"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Send GSM 7-Bit With Language in Body"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Send UMTS 7 Bit With Language"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Send GSM UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Send UMTS UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Send UMTS UCS-2 Multi-Page Broadcast"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Send GSM UCS-2 With Language"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Send UMTS UCS-2 With Language"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Delay 5 seconds before sending"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Message-ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Category:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Mobile Broadcast Tests"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Send ETWS Earthquake Broadcast"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Send ETWS Tsunami Broadcast"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Send ETWS Earthquake and Tsunami Broadcast"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Send ETWS Other Emergency Broadcast"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Send ETWS Cancel Broadcast"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Send ETWS Test Broadcast"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Send CMAS Presidential Alert"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Send CMAS Extreme Alert"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Send CMAS Severe Alert"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Send CMAS AMBER Alert"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Send CMAS Monthly Test Alert"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Send GSM 7-Bit Test Broadcast"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Send UMTS 7-Bit Test Broadcast"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Send GSM 7-Bit Full-Length Broadcast"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Send UMTS 7-Bit Full-Length Broadcast"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Send GSM 7-Bit Multi-Page Broadcast"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Send UMTS 7-Bit Multi-Page Broadcast"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Send GSM 7 Bit With Language"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Send GSM 7-Bit With Language in Body"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Send UMTS 7 Bit With Language"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Send GSM UCS-2 Test Broadcast"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Send UMTS UCS-2 Test Broadcast"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Send UMTS UCS-2 Multi-Page Broadcast"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Send GSM UCS-2 With Language"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Send UMTS UCS-2 With Language"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Delay 5 seconds before sending"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Message ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Category:"</string>
 </resources>
diff --git a/tests/testapp/res/values-en-rIN/strings.xml b/tests/testapp/res/values-en-rIN/strings.xml
index dd5e082..c421957 100644
--- a/tests/testapp/res/values-en-rIN/strings.xml
+++ b/tests/testapp/res/values-en-rIN/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Mobile Broadcast Tests"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Send ETWS Normal Broadcast"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Send ETWS Cancel Broadcast"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Send ETWS Test Broadcast"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Send CMAS Presidential Alert"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Send CMAS Extreme Alert"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Send CMAS Severe Alert"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Send CMAS AMBER Alert"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Send CMAS Monthly Test Alert"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Send GSM 7-Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Send UMTS 7-Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Send GSM 7-Bit Full-Length Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Send UMTS 7-Bit Full-Length Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Send GSM 7-Bit Multi-Page Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Send UMTS 7-Bit Multi-Page Broadcast"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Send GSM 7 Bit With Language"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Send GSM 7-Bit With Language in Body"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Send UMTS 7 Bit With Language"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Send GSM UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Send UMTS UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Send UMTS UCS-2 Multi-Page Broadcast"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Send GSM UCS-2 With Language"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Send UMTS UCS-2 With Language"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Delay 5 seconds before sending"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Message-ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Category:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Mobile Broadcast Tests"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Send ETWS Earthquake Broadcast"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Send ETWS Tsunami Broadcast"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Send ETWS Earthquake and Tsunami Broadcast"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Send ETWS Other Emergency Broadcast"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Send ETWS Cancel Broadcast"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Send ETWS Test Broadcast"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Send CMAS Presidential Alert"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Send CMAS Extreme Alert"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Send CMAS Severe Alert"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Send CMAS AMBER Alert"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Send CMAS Monthly Test Alert"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Send GSM 7-Bit Test Broadcast"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Send UMTS 7-Bit Test Broadcast"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Send GSM 7-Bit Full-Length Broadcast"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Send UMTS 7-Bit Full-Length Broadcast"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Send GSM 7-Bit Multi-Page Broadcast"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Send UMTS 7-Bit Multi-Page Broadcast"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Send GSM 7 Bit With Language"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Send GSM 7-Bit With Language in Body"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Send UMTS 7 Bit With Language"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Send GSM UCS-2 Test Broadcast"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Send UMTS UCS-2 Test Broadcast"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Send UMTS UCS-2 Multi-Page Broadcast"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Send GSM UCS-2 With Language"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Send UMTS UCS-2 With Language"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Delay 5 seconds before sending"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Message ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Category:"</string>
 </resources>
diff --git a/tests/testapp/res/values-es-rUS/strings.xml b/tests/testapp/res/values-es-rUS/strings.xml
index 638e4af..cee186a 100644
--- a/tests/testapp/res/values-es-rUS/strings.xml
+++ b/tests/testapp/res/values-es-rUS/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Pruebas de difusión por teléfono celular"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Enviar difusión normal de ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Enviar difusión de cancelación de ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Enviar difusión de prueba de ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Enviar alerta presidencial del CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Enviar alerta extrema del CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Enviar alerta grave del CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Enviar alerta AMBER del CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Enviar alerta de prueba mensual del CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Enviar difusión de prueba de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Enviar difusión de prueba de UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Enviar difusión de longitud completa de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Enviar difusión de longitud completa de UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Enviar difusión de páginas múltiples de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Enviar difusión de páginas múltiples de UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Enviar GSM 7 Bit con idioma"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Enviar GSM 7 bits con idioma"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Enviar UMTS 7 Bit con idioma"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Enviar difusión de prueba de GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Enviar difusión de prueba de UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Enviar difusión de páginas múltiples de UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Enviar GSM UCS-2, con idioma"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Enviar UMTS UCS-2 con idioma"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Retrasar 5 segundos antes de enviar"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID de mensaje:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categoría:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Pruebas de emisión móvil"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Enviar transmisión de ETWS para terremotos"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Enviar transmisión de ETWS para tsunamis"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Enviar transmisión de ETWS para terremotos y tsunamis"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Enviar transmisión de ETWS para otras emergencias"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Enviar difusión de cancelación de ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Enviar difusión de prueba de ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Enviar alerta presidencial del CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Enviar alerta extrema del CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Enviar alerta grave del CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Enviar alerta AMBER del CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Enviar alerta de prueba mensual del CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Enviar difusión de prueba de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Enviar difusión de prueba de UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Enviar difusión de longitud completa de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Enviar difusión de longitud completa de UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Enviar difusión de páginas múltiples de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Enviar difusión de páginas múltiples de UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Enviar GSM 7 Bit con idioma"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Enviar GSM 7 bits con idioma en el cuerpo"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Enviar UMTS 7 Bit con idioma"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Enviar difusión de prueba de GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Enviar difusión de prueba de UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Enviar difusión de páginas múltiples de UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Enviar GSM UCS-2 con idioma"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Enviar UMTS UCS-2 con idioma"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Demorar cinco segundos antes de enviar"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID de mensaje:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categoría:"</string>
 </resources>
diff --git a/tests/testapp/res/values-es/strings.xml b/tests/testapp/res/values-es/strings.xml
index 75cc094..4bbdb18 100644
--- a/tests/testapp/res/values-es/strings.xml
+++ b/tests/testapp/res/values-es/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Pruebas de mensajes de radiodifusión"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Enviar emisión normal de ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Enviar difusión de cancelación de ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Enviar difusión de prueba de ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Enviar alerta presidencial del CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Enviar alerta extrema del CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Enviar alerta grave del CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Enviar alerta AMBER del CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Enviar alerta de prueba mensual del CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Enviar difusión de prueba de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Enviar difusión de prueba de UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Enviar difusión completa de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Enviar difusión completa de UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Enviar difusión de varias páginas de GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Enviar difusión de varias páginas de UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Enviar GSM 7 Bit con idioma"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Enviar GSM 7 Bit con idioma en cuerpo"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Enviar UMTS 7 Bit con idioma"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Enviar difusión de prueba de GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Enviar difusión de prueba de UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Enviar difusión de varias páginas de UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Enviar GSM UCS-2 con idioma"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Enviar UMTS UCS-2 con idioma"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Retrasar 5 segundos antes de enviar"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID de mensaje:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categoría:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Pruebas de mensajes de radiodifusión"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Enviar difusión de terremoto de ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Enviar difusión de tsunami de ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Enviar difusión de tsunami y terremoto de ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Enviar otra difusión de emergencia de ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Enviar difusión de cancelación de ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Enviar difusión de prueba de ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Enviar alerta presidencial del CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Enviar alerta extrema del CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Enviar alerta grave del CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Enviar alerta AMBER del CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Enviar alerta de prueba mensual del CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Enviar difusión de prueba de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Enviar difusión de prueba de UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Enviar difusión completa de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Enviar difusión completa de UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Enviar difusión de varias páginas de GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Enviar difusión de varias páginas de UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Enviar GSM 7 Bit con idioma"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Enviar GSM 7 Bit con idioma en cuerpo"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Enviar UMTS 7 Bit con idioma"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Enviar difusión de prueba de GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Enviar difusión de prueba de UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Enviar difusión de varias páginas de UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Enviar GSM UCS-2 con idioma"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Enviar UMTS UCS-2 con idioma"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Retrasar 5 segundos antes de enviar"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID de mensaje:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categoría:"</string>
 </resources>
diff --git a/tests/testapp/res/values-et-rEE/strings.xml b/tests/testapp/res/values-et-rEE/strings.xml
deleted file mode 100644
index f2e57d4..0000000
--- a/tests/testapp/res/values-et-rEE/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Kärjeteate testid"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Saada ETWS-i tavasaade"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Saada ETWS-i saate tühistus"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Saada ETWS-i testsaade"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Saada CMAS-i presidendihäire"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Saada CMAS-i äärmuslik häire"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Saada CMAS-i ränk häire"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Saada CMAS-i AMBER-häire"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Saada CMAS-i igakuine katsehäire"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Saada GSM 7-bitine testsaade"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Saada UMTS 7-bitine testsaade"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Saada GSM-i 7-bitine täispikkuses saade"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Saada UMTS-i 7-bitine täispikkuses saade"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Saada GSM-i 7-bitine mitmeleheline saade"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Saada UMTS 7-bitine mitmeleheline saade"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Saada GSM-i 7-bitine koos keelega"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Saada GSM-i 7-bitine kodeering koos keelega sisus"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Saada UMTS-i 7-bitine koos keelega"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Saada GSM UCS-2 testsaade"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Saada UMTS UCS-2 testsaade"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Saada UMTS UCS-2 mitmeleheline saade"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Saada GSM UCS-2 koos keelega"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Saada UMTS UCS-2 koos keelega"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Viivita 5 sekundit enne saatmist"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Sõnumi ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategooria:"</string>
-</resources>
diff --git a/tests/testapp/res/values-et/strings.xml b/tests/testapp/res/values-et/strings.xml
new file mode 100644
index 0000000..70f937f
--- /dev/null
+++ b/tests/testapp/res/values-et/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Kärjeteate testid"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"ETWS-i maavärina teate saatmine"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"ETWS-i hiidlaine teate saatmine"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"ETWS-i maavärina ja hiidlaine teate saatmine"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Muu ETWS-i hädaolukorra teate saatmine"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Saada ETWS-i teate tühistus"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Saada ETWS-i testteade"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Saada CMAS-i presidendihäire"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Saada CMAS-i äärmuslik häire"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Saada CMAS-i range häire"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Saada CMAS-i KOLLANE häire"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Saada CMAS-i igakuine testhäire"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Saada GSM-i 7-bitine testteade"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Saada UMTS-i 7-bitine testteade"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Saada GSM-i 7-bitine täispikkuses teade"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Saada UMTS-i 7-bitine täispikkuses teade"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Saada GSM-i 7-bitine mitmeleheline teade"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Saada UMTS-i 7-bitine mitmeleheline teade"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Saada GSM-i 7-bitine kodeering koos keelega"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Saada GSM-i 7-bitine kodeering koos keelega sisus"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Saada UMTS-i 7-bitine kodeering koos keelega"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Saada GSM-i UCS-2 testteade"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Saada UMTS-i UCS-2 testteade"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Saada UMTS-i UCS-2 mitmeleheline teade"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Saada GSM-i UCS-2 kodeering koos keelega"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Saada UMTS-i UCS-2 kodeering koos keelega"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Viivita viis sekundit enne saatmist"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Sõnumi ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategooria:"</string>
+</resources>
diff --git a/tests/testapp/res/values-eu-rES/strings.xml b/tests/testapp/res/values-eu-rES/strings.xml
deleted file mode 100644
index f002d57..0000000
--- a/tests/testapp/res/values-eu-rES/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Sare mugikor bidezko igorpenen probak"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Bidali ohiko ETWS igorpena"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Bidali bertan behera utzitako ETWS igorpena"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Bidali probako ETWS igorpena"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Bidali presidentetzako CMAS alerta"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Bidali muturreko CMAS alerta"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Bidali alerta CMAS larria"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Bidali AMBER CMAS alerta"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Bidali hileroko probako CMAS alerta"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Bidali probako GSM 7 biteko igorpena"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Bidali probako UMTS 7 biteko igorpena"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Bidali GSM 7 biteko igorpen osoa"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Bidali UMTS 7 biteko igorpen osoa"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Bidali hainbat orriko GSM 7 biteko igorpena"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Bidali hainbat orriko UMTS 7 biteko igorpena"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Bidali GSM 7 biteko hizkuntzarekin"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Bidali GSM 7 gorputzeko hizkuntzarekin"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Bidali UMTS 7 biteko hizkuntzarekin"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Bidali probako GSM UCS-2 igorpena"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Bidali probako UMTS UCS-2 igorpena"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Bidali hainbat orriko UMTS UCS-2 igorpena"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Bidali GSM UCS-2 hizkuntzarekin"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Bidali UMTS UCS-2 hizkuntzarekin"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Atzeratu 5 segundo bidali aurretik"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Mezuaren IDa:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategoria:"</string>
-</resources>
diff --git a/tests/testapp/res/values-eu/strings.xml b/tests/testapp/res/values-eu/strings.xml
new file mode 100644
index 0000000..a732534
--- /dev/null
+++ b/tests/testapp/res/values-eu/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Sare mugikor bidezko igorpenen probak"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Bidali lurrikaren inguruko ETWS igorpena"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Bidali tsunamien inguruko ETWS igorpena"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Bidali lurrikaren eta tsunamien inguruko ETWS igorpena"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Bidali bestelako larrialdi baten inguruko ETWS igorpena"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Bidali bertan behera utzitako ETWS igorpena"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Bidali probako ETWS igorpena"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Bidali presidentetzako CMAS alerta"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Bidali muturreko CMAS alerta"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Bidali alerta CMAS larria"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Bidali AMBER CMAS alerta"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Bidali hileroko probako CMAS alerta"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Bidali probako 7 biteko GSM igorpena"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Bidali probako 7 biteko UMTS igorpena"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Bidali 7 biteko GSM igorpen osoa"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Bidali 7 biteko UMTS igorpen osoa"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Bidali hainbat orriko 7 biteko GSM igorpena"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Bidali hainbat orriko 7 biteko UMTS igorpena"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Bidali 7 biteko GSM igorpena hizkuntzarekin"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Bidali 7 biteko GSM igorpena gorputzeko hizkuntzarekin"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Bidali 7 biteko UMTS igorpena gorputzeko hizkuntzarekin"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Bidali probako UCS-2 GSM igorpena"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Bidali probako UCS-2 UMTS igorpena"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Bidali hainbat orriko UCS-2 UMTS igorpena"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Bidali UCS-2 GSM igorpena hizkuntzarekin"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Bidali UCS-2 UMTS igorpena hizkuntzarekin"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Atzeratu 5 segundo bidali aurretik"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Mezuaren IDa:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategoria:"</string>
+</resources>
diff --git a/tests/testapp/res/values-fa/strings.xml b/tests/testapp/res/values-fa/strings.xml
index 6f34907..419ec64 100644
--- a/tests/testapp/res/values-fa/strings.xml
+++ b/tests/testapp/res/values-fa/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"آزمایش های پخش سلولی"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"‏ارسال پخش عادی ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"‏ارسال لغو پخش ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"‏ارسال پخش تستی ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"‏ارسال هشدار ریاست جمهوری CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"‏ارسال هشدار بسیار شدید CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"‏ارسال هشدار شدید CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"‏ارسال هشدار CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"‏ارسال هشدار آزمایش ماهانه CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"‏ارسال پخش تست GSM 7 بیت"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"‏ارسال UMTS 7 بیت پخش تست"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"‏ارسال GSM 7 بیت با پخش طول کامل"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"‏ارسال پخش طول کامل UMTS 7 بیت"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"‏ارسال پخش چند صفحه‌ای GSM 7 بیت"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"‏ارسال پخش چند صفحه‌ای UMTS 7 بیت"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"‏ارسال GSM 7 بیت با زبان"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"‏ارسال GSM 7 بیت با زبان در متن"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"‏ارسال UMTS 7 بیت با زبان"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"‏ارسال پخش تستی GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"‏ارسال پخش تست UMTS UCS - 2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"‏ارسال پخش چند صفحه‌ای UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"‏ارسال GSM UCS-2 با زبان"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"‏ارسال UMTS UCS-2 با زبان"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"۵ ثانیه تأخیر قبل از ارسال"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"شناسه پیام:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"دسته:"</string>
+    <string name="app_label" msgid="2704349695846064655">"آزمایش‌های پخش سلولی"</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>
+    <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_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 AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"‏ارسال هشدار آزمایش ماهانه CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"‏پخش عمومی تستی ارسال GSM‏ ۷ بیتی"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"‏پخش عمومی تستی ارسال UMTS ‏۷ بیتی"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"‏پخش عمومی کامل ارسال GSM‏ ۷ بیتی"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"‏پخش عمومی کامل ارسال UMTS ‏۷ بیتی"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"‏پخش عمومی چند صفحه‌ای ارسال GSM‏ ۷ بیتی"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"‏پخش عمومی چند صفحه‌ای ارسال UMTS ‏۷ بیتی"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"‏ارسال GSM‏ ۷ بیتی با زبان"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"‏ارسال GSM‏ ۷ بیتی با زبان در متن"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"‏ارسال GSM‏ ۷ بیتی با زبان"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"‏پخش عمومی تستی ارسال GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"‏پخش عمومی تستی ارسال UMTS UCS - 2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"‏پخش عمومی چندصفحه‌ای ارسال UMTS UCS-2"</string>
+    <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">"شناسه پیام:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"دسته:"</string>
 </resources>
diff --git a/tests/testapp/res/values-fi/strings.xml b/tests/testapp/res/values-fi/strings.xml
index 4af0776..4765974 100644
--- a/tests/testapp/res/values-fi/strings.xml
+++ b/tests/testapp/res/values-fi/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Cell Broadcast -testit"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Lähetä ETWS-normaalilähetys"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Lähetä ETWS-peruutuslähetys"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Lähetä ETWS-testilähetys"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Lähetä CMAS:n presidenttitason hälytys"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Lähetä CMAS:n äärimmäinen hälytys"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Lähetä CMAS:n vakava hälytys"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Lähetä CMAS:n AMBER-hälytys"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Lähetä CMAS:n kuukausittainen testihälytys"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Lähetä 7-bittinen GSM-testilähetys"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Lähetä 7-bittinen UMTS-testilähetys"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Lähetä täyspitkä 7-bittinen GSM-lähetys"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Lähetä täyspitkä 7-bittinen UMTS-lähetys"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Lähetä täyspitkä 7-bittinen usean sivun GMS-lähetys"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Lähetä 7-bittinen usean sivun UMTS-lähetys"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Lähetä 7-bittinen GSM kielellä"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Lähetä 7-bittinen GSM, teksti runko-osassa"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Lähetä 7-bittinen UMTS kielellä"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Lähetä GSM UCS-2 -testilähetys"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Lähetä UMTS UCS-2 -testilähetys"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Lähetä usean sivun UMTS UCS-2 -lähetys"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Lähetä GSM UCS-2 kielellä"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Lähetä GSM UCS-2 kielellä"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"5 sekunnin viive ennen lähettämistä"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Viestin tunnus:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Luokka:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Solulähetystestit"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Lähetä ETWS:n maanjäristyslähetys"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Lähetä ETWS:n tsunamilähetys"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Lähetä ETWS:n maanjäristys- ja tsunamilähetys"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Lähetä ETWS:n muun hätätilanteen lähetys"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Lähetä ETWS-peruutuslähetys"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Lähetä ETWS-testilähetys"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Lähetä CMAS:n presidenttitason hälytys"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Lähetä CMAS:n äärimmäinen hälytys"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Lähetä CMAS:n vakava hälytys"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Lähetä CMAS:n AMBER-hälytys"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Lähetä CMAS:n kuukausittainen testihälytys"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Lähetä 7-bittinen GSM-testilähetys"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Lähetä 7-bittinen UMTS-testilähetys"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Lähetä täyspitkä 7-bittinen GSM-lähetys"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Lähetä täyspitkä 7-bittinen UMTS-lähetys"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Lähetä täyspitkä 7-bittinen usean sivun GMS-lähetys"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Lähetä 7-bittinen usean sivun UMTS-lähetys"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Lähetä 7-bittinen GSM kielellä"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Lähetä 7-bittinen GSM, teksti runko-osassa"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Lähetä 7-bittinen UMTS kielellä"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Lähetä GSM UCS-2 -testilähetys"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Lähetä UMTS UCS-2 -testilähetys"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Lähetä usean sivun UMTS UCS-2 -lähetys"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Lähetä GSM UCS-2 kielellä"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Lähetä GSM UCS-2 kielellä"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"5 sekunnin viive ennen lähettämistä"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Viestin tunnus:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Arvot:"</string>
 </resources>
diff --git a/tests/testapp/res/values-fr-rCA/strings.xml b/tests/testapp/res/values-fr-rCA/strings.xml
index f7b9ae1..62ff0b7 100644
--- a/tests/testapp/res/values-fr-rCA/strings.xml
+++ b/tests/testapp/res/values-fr-rCA/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Tests de diffusion cellulaire"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Envoyer une diffusion ETWS normale"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Envoyer une diffusion d\'annulation ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Envoyer une diffusion test ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Envoyer l\'alerte présidentielle du CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Envoyer l\'alerte extrême du CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Envoyer l\'alerte importante du CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Envoyer l\'alerte AMBER du CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Envoyer l\'alerte test mensuelle du CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Envoyer une diffusion test GSM 7 bits"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Envoyer une diffusion test UMTS 7 bits"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Envoyer une diffusion longueur intégrale GSM 7 bits"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Envoyer une diffusion longueur intégrale UMTS 7 bits"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Envoyer une diffusion multipage GSM 7 bits"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Envoyer une diffusion multipage UMTS 7 bits"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Envoyer en GSM 7 bits avec le langage"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Envoyer une alerte GSM 7 bits avec le langage dans le corps du message"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Envoyer en UMTS 7 bits avec le langage"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Envoyer une diffusion test GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Envoyer une diffusion test UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Envoyer une diffusion multipage UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Envoyer en GSM UCS-2 avec le langage"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Envoyer en UMTS UCS-2 avec le langage"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Retarder l\'envoi de cinq secondes"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Identifiant du message :"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Catégorie :"</string>
+    <string name="app_label" msgid="2704349695846064655">"Tests de diffusion cellulaire"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Envoyer une diffusion de tremblement de terre ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Envoyer une diffusion de tsunami ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Envoyer une diffusion de tremblement de terre et de tsunami ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Envoyer une diffusion d\'autre urgence ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Envoyer une diffusion d\'annulation ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Envoyer une diffusion test ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Envoyer l\'alerte « Présidentielle » du CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Envoyer l\'alerte « Extrême » du CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Envoyer l\'alerte « Importante » du CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Envoyer l\'alerte AMBER du CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Envoyer l\'alerte « Test mensuel » du CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Envoyer une diffusion test GSM de 7 bits"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Envoyer une diffusion test UMTS de 7 bits"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Envoyer une diffusion longueur intégrale GSM de 7 bits"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Envoyer une diffusion longueur intégrale UMTS de 7 bits"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Envoyer une diffusion multipage GSM de 7 bits"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Envoyer une diffusion multipage UMTS de 7 bits"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Envoyer en GSM de 7 bits avec le langage"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Envoyer une alerte GSM de 7 bits avec le langage dans le corps du message"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Envoyer en UMTS de 7 bits avec le langage"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Envoyer une diffusion test GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Envoyer une diffusion test UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Envoyer une diffusion multipage UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Envoyer en GSM UCS-2 avec le langage"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Envoyer en UMTS UCS-2 avec le langage"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Retarder l\'envoi de cinq secondes"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Identifiant de message :"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Catégorie :"</string>
 </resources>
diff --git a/tests/testapp/res/values-fr/strings.xml b/tests/testapp/res/values-fr/strings.xml
index 3a51385..4030ffb 100644
--- a/tests/testapp/res/values-fr/strings.xml
+++ b/tests/testapp/res/values-fr/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Tests de diffusion cellulaire"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Envoyer une diffusion ETWS normale"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Envoyer une diffusion d\'annulation ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Envoyer une diffusion test ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Envoyer l\'alerte présidentielle du CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Envoyer l\'alerte extrême du CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Envoyer l\'alerte importante du CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Envoyer l\'alerte Enlèvement du CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Envoyer l\'alerte test mensuelle du CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Envoyer une diffusion test GSM 7 bits"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Envoyer une diffusion test UMTS 7 bits"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Envoyer une diffusion longueur intégrale GSM 7 bits"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Envoyer une diffusion longueur intégrale UMTS 7 bits"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Envoyer une diffusion multipage GSM 7 bits"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Envoyer une diffusion multipage UMTS 7 bits"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Envoyer en GSM 7 bits avec le langage"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Envoyer une alerte GSM 7 bits avec le langage dans le corps du message"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Envoyer en UMTS 7 bits avec le langage"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Envoyer une diffusion test GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Envoyer une diffusion test UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Envoyer une diffusion multipage UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Envoyer en GSM UCS-2 avec le langage"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Envoyer en UMTS UCS-2 avec le langage"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Retarder l\'envoi de cinq secondes"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Identifiant du message :"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Catégorie :"</string>
+    <string name="app_label" msgid="2704349695846064655">"Tests de diffusion cellulaire"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Envoyer une diffusion ETWS au sujet d\'un tremblement de terre"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Envoyer une diffusion ETWS au sujet d\'un tsunami"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Envoyer une diffusion ETWS au sujet d\'un tremblement de terre et d\'un tsunami"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Envoyer une diffusion ETWS au sujet d\'une autre urgence"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Envoyer une diffusion d\'annulation ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Envoyer une diffusion test ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Envoyer l\'alerte présidentielle du CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Envoyer l\'alerte extrême du CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Envoyer l\'alerte importante du CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Envoyer l\'alerte Enlèvement du CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Envoyer l\'alerte test mensuelle du CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Envoyer une diffusion test GSM 7 bits"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Envoyer une diffusion test UMTS 7 bits"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Envoyer une diffusion longueur intégrale GSM 7 bits"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Envoyer une diffusion longueur intégrale UMTS 7 bits"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Envoyer une diffusion multipage GSM 7 bits"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Envoyer une diffusion multipage UMTS 7 bits"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Envoyer en GSM 7 bits avec le langage"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Envoyer une alerte GSM 7 bits avec le langage dans le corps du message"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Envoyer en UMTS 7 bits avec le langage"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Envoyer une diffusion test GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Envoyer une diffusion test UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Envoyer une diffusion multipage UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Envoyer en GSM UCS-2 avec le langage"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Envoyer en UMTS UCS-2 avec le langage"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Retarder l\'envoi de cinq secondes"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID du message :"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Catégorie :"</string>
 </resources>
diff --git a/tests/testapp/res/values-gl-rES/strings.xml b/tests/testapp/res/values-gl-rES/strings.xml
deleted file mode 100644
index 1449f09..0000000
--- a/tests/testapp/res/values-gl-rES/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Probas da difusión móbil"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Enviar emisión normal de ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Enviar emisión de cancelación de ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Enviar emisión de proba de ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Enviar alerta presidencial de CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Enviar alerta extrema de CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Enviar alerta grave de CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Enviar alerta AMBER de CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Enviar alerta de proba mensual de CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Enviar emisión de proba de 7 bits de GSM"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Enviar emisión de proba de 7 bits de UMTS"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Enviar emisión completa de 7 bits de GSM"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Enviar emisión completa de 7 bits de UMTS"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Enviar emisión de varias páxinas de 7 bits de GSM"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Enviar emisión de varias páxinas de 7 bits de UMTS"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Enviar emisión de 7 bits de GSM que inclúa o idioma"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Enviar emisión de 7 bits de GSM que inclúa o idioma no corpo"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Enviar emisión de 7 bits de UMTS que inclúa o idioma"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Enviar emisión de proba de GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Enviar emisión de proba de UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Enviar emisión de varias páxinas de UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Enviar emisión de GSM UCS-2 que inclúa o idioma"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Enviar emisión de proba de UMTS UCS-2"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Esperar 5 segundos para enviala"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID da mensaxe:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categoría:"</string>
-</resources>
diff --git a/tests/testapp/res/values-gl/strings.xml b/tests/testapp/res/values-gl/strings.xml
new file mode 100644
index 0000000..4d78064
--- /dev/null
+++ b/tests/testapp/res/values-gl/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Probas da difusión móbil"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Enviar emisión de terremotos de ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Enviar emisión de tsunamis de ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Enviar emisión de terremotos e tsunamis de ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Enviar emisión doutra emerxencia de ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Enviar emisión de cancelación de ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Enviar emisión de proba de ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Enviar alerta presidencial de CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Enviar alerta extrema de CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Enviar alerta grave de CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Enviar alerta AMBER de CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Enviar alerta de proba mensual de CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Enviar emisión de proba de 7 bits de GSM"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Enviar emisión de proba de 7 bits de UMTS"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Enviar emisión completa de 7 bits de GSM"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Enviar emisión completa de 7 bits de UMT"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Enviar emisión de varias páxinas de 7 bits de GSM"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Enviar emisión de varias páxinas de 7 bits de UMTS"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Enviar emisión de 7 bits de GSM que inclúa o idioma"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Enviar emisión de 7 bits de GSM que inclúa o idioma no corpo"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Enviar emisión de 7 bits de UMTS que inclúa o idioma"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Enviar emisión de proba de GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Enviar emisión de proba de UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Enviar emisión de varias páxinas de UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Enviar emisión de GSM UCS-2 que inclúa o idioma"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Enviar emisión de proba de UMTS UCS-2"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Esperar 5 segundos para enviala"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID da mensaxe:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categoría:"</string>
+</resources>
diff --git a/tests/testapp/res/values-gu-rIN/strings.xml b/tests/testapp/res/values-gu-rIN/strings.xml
deleted file mode 100644
index c1885bf..0000000
--- a/tests/testapp/res/values-gu-rIN/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"સેલ બ્રોડકાસ્ટ પરીક્ષણો"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS સામાન્ય બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS રદ કરોનું બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS પ્રમુખપદની ચેતવણી મોકલો"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS અત્યંતની ચેતવણી મોકલો"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS ગંભીરની ચેતવણી મોકલો"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER ચેતવણી મોકલો"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS માસિક પરીક્ષણની ચેતવણી મોકલો"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 બિટ પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 બિટ પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 બિટ પૂર્ણ લંબાઈનું બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 બિટ પૂર્ણ લંબાઈનું બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 બિટ મલ્ટી પૃષ્ઠ બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 બિટ મલ્ટી પૃષ્ઠ બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 બિટ ભાષા સાથે મોકલો"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"મુખ્ય ભાગમાં ભાષા સાથે GSM 7 બિટ મોકલો"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 બિટ ભાષા સાથે મોકલો"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 મલ્ટી પૃષ્ઠ બ્રોડકાસ્ટ મોકલો"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 ભાષા સાથે મોકલો"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 ભાષા સાથે મોકલો"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"મોકલતા પહેલા 5 સેકંડનો વિલંબ"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"સંદેશ ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"કૅટેગરી:"</string>
-</resources>
diff --git a/tests/testapp/res/values-gu/strings.xml b/tests/testapp/res/values-gu/strings.xml
new file mode 100644
index 0000000..c2680cf
--- /dev/null
+++ b/tests/testapp/res/values-gu/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"સેલ બ્રોડકાસ્ટ પરીક્ષણો"</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>
+    <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_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 AMBER ચેતવણી મોકલો"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS માસિક પરીક્ષણની ચેતવણી મોકલો"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 બિટ પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 બિટ પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 બિટ પૂર્ણ લંબાઈનું બ્રોડકાસ્ટ મોકલો"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 બિટ પૂર્ણ લંબાઈનું બ્રોડકાસ્ટ મોકલો"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 બિટ મલ્ટિ પૃષ્ઠ બ્રોડકાસ્ટ મોકલો"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 બિટ મલ્ટિ પૃષ્ઠ બ્રોડકાસ્ટ મોકલો"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7 બિટ ભાષા સાથે મોકલો"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"મુખ્ય ભાગમાં ભાષા સાથે GSM 7 બિટ મોકલો"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7 બિટ ભાષા સાથે મોકલો"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 પરીક્ષણ બ્રોડકાસ્ટ મોકલો"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 મલ્ટિ પૃષ્ઠ બ્રોડકાસ્ટ મોકલો"</string>
+    <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">"મોકલતા પહેલા 5 સેકંડનો વિલંબ"</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-hi/strings.xml b/tests/testapp/res/values-hi/strings.xml
index 245902e..8638eb1 100644
--- a/tests/testapp/res/values-hi/strings.xml
+++ b/tests/testapp/res/values-hi/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"सेल प्रसारण परीक्षण"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS सामान्‍य प्रसारण भेजें"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS रद्द करने का प्रसारण भेजें"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS परीक्षण प्रसारण भेजें"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS अध्‍यक्षीय अलर्ट भेजें"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS अत्यधिक अलर्ट भेजें"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS गंभीर अलर्ट भेजें"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER अलर्ट भेजें"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS मासिक परीक्षण अलर्ट भेजें"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 बिट परीक्षण प्रसारण भेजें"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 बिट परीक्षण प्रसारण भेजें"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 बिट पूर्ण लंबाई के प्रसारण भेजें"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 बिट पूर्ण अवधि प्रसारण भेजें"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 बिट एकाधिक पृष्ठ प्रसारण भेजें"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 बिट एकाधिक पृष्ठ प्रसारण भेजें"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 बिट भाषा के साथ भेजें"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"मुख्‍य भाग में भाषा के साथ GSM 7 बिट भेजें"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"भाषा के साथ UMTS 7 बिट भेजें"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 परीक्षण प्रसारण भेजें"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 परीक्षण प्रसारण भेजें"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 एकाधिक पृष्ठ प्रसारण भेजें"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"भाषा के साथ GSM UCS-2 भेजें"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"भाषा के साथ UMTS UCS-2 भेजें"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"भेजने से पहले 5 सेकंड का विलंब रखें"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"संदेश ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"श्रेणी:"</string>
+    <string name="app_label" msgid="2704349695846064655">"सेल प्रसारण परीक्षण"</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>
+    <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_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 AMBER सूचना भेजें"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS मासिक परीक्षण सूचना भेजें"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 बिट परीक्षण प्रसारण भेजें"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 बिट परीक्षण प्रसारण भेजें"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 बिट पूर्ण अवधि के प्रसारण भेजें"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 बिट पूर्ण अवधि प्रसारण भेजें"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 बिट एकाधिक पेज प्रसारण भेजें"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 बिट एकाधिक पेज प्रसारण भेजें"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"भाषा के साथ GSM 7 बिट भेजें"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"मुख्‍य भाग में भाषा के साथ GSM 7 बिट भेजें"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"भाषा के साथ UMTS 7 बिट भेजें"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 परीक्षण प्रसारण भेजें"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 परीक्षण प्रसारण भेजें"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 एकाधिक पेज प्रसारण भेजें"</string>
+    <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">"भेजने से पहले 5 सेकंड का विलंब रखें"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"संदेश आईडी:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"श्रेणी:"</string>
 </resources>
diff --git a/tests/testapp/res/values-hr/strings.xml b/tests/testapp/res/values-hr/strings.xml
index 9588aa6..3c7f67d 100644
--- a/tests/testapp/res/values-hr/strings.xml
+++ b/tests/testapp/res/values-hr/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Testovi emitiranja na mobitele"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Pošalji ETWS-ovo normalno emitiranje"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Pošalji ETWS otkazani prijenos"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Pošalji ETWS testni prijenos"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Pošalji CMAS-ovo predsjedničko upozorenje"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Pošalji CMAS-ovo ekstremno upozorenje"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Pošalji CMAS-ovo ozbiljno upozorenje"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Pošalji CMAS-ovo upozorenje AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Pošalji CMAS-ovo mjesečno probno upozorenje"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Pošalji GSM 7 Bit testni prijenos"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Pošalji UMTS 7 Bit testni prijenos"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Pošalji GSM 7 Bit prijenos pune duljine"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Pošalji UMTS 7 Bit prijenos pune duljine"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Pošalji GSM 7 Bit prijenos za više stranica"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Pošalji UMTS 7 Bit prijenos više stranica"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Pošalji GSM 7 Bit s jezikom"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Pošalji 7-bitni GSM s jezikom u glavnom dijelu"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Pošalji UMTS 7 Bit s jezikom"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Pošalji GSM UCS-2 testni prijenos"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Pošalji UMTS UCS-2 testni prijenos"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Pošalji UMTS UCS-2 prijenos više stranica"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Pošalji GSM UCS-2 s jezikom"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Pošalji UMTS UCS-2 s jezikom"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Odgodi slanje za 5 sekundi"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID poruke:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorija:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Testovi emitiranja na mobitele"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Pošalji ETWS-ovo emitiranje o potresima"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Pošalji ETWS-ovo emitiranje o tsunamijima"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Pošalji ETWS-ovo emitiranje o potresima i tsunamijima"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Pošalji ETWS-ovo emitiranje o ostalim hitnim situacijama"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Pošalji ETWS-ovo otkazano emitiranje"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Pošalji ETWS-ovo probno emitiranje"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Pošalji CMAS-ovo predsjedničko upozorenje"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Pošalji CMAS-ovo ekstremno upozorenje"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Pošalji CMAS-ovo ozbiljno upozorenje"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Pošalji CMAS-ovo upozorenje AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Pošalji CMAS-ovo mjesečno probno upozorenje"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Pošalji 7-bitno GSM-ovo probno emitiranje"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Pošalji 7-bitno UMTS-ovo probno emitiranje"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Pošalji 7-bitno GSM-ovo emitiranje pune duljine"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Pošalji 7-bitno UMTS-ovo emitiranje pune duljine"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Pošalji 7-bitno GSM-ovo emitiranje više stranica"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Pošalji 7-bitno UMTS-ovo emitiranje više stranica"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Pošalji 7-bitno GSM-ovo emitiranje s tekstom"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Pošalji 7-bitno GSM-ovo emitiranje s tekstom u glavnom dijelu"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Pošalji 7-bitno UMTS-ovo emitiranje s tekstom"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Pošalji GSM UCS-2 probno emitiranje"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Pošalji UMTS UCS-2 probno emitiranje"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Pošalji UMTS UCS-2 emitiranje više stranica"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Pošalji GSM UCS-2 s tekstom"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Pošalji UMTS UCS-2 s tekstom"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Odgodi slanje za 5 sekundi"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID poruke:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorija:"</string>
 </resources>
diff --git a/tests/testapp/res/values-hu/strings.xml b/tests/testapp/res/values-hu/strings.xml
index fbcd971..ff364c6 100644
--- a/tests/testapp/res/values-hu/strings.xml
+++ b/tests/testapp/res/values-hu/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Cellán belüli adás tesztelése"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS normál adás küldése"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS sugárzás megszakításának küldése"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS tesztsugárzás küldése"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"A CMAS elnöki jelzésének küldése"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS extrém jelzés küldése"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS súlyos jelzés küldése"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER jelzés küldése"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"A CMAS havi kísérleti jelzésének küldése"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GMS 7 bit küldése -- tesztsugárzás"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 bit küldése - tesztsugárzás"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GMS 7 bit küldése -- teljes hosszúságú sugárzás"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 bit küldése -- teljes hosszúságú sugárzás"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 bit küldése -- többoldalas sugárzás"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 bit küldése -- többoldalas sugárzás"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 bit küldése nyelvvel együtt"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM 7 bit küldése nyelvvel együtt a törzsben"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 bit küldése nyelvvel együtt"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 küldése -- tesztsugárzás"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 küldése -- tesztsugárzás"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 küldése -- többoldalas sugárzás"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 küldése nyelvvel együtt"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 küldése nyelvvel együtt"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"5 másodperces késleltetés küldés előtt"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Üzenetazonosító:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategória:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Cellán belüli adás tesztelése"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Az ETWS földrengésjelentéseinek küldése"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Az ETWS szökőárjelentéseinek küldése"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Az ETWS földrengés- és szökőárjelentéseinek küldése"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Az ETWS egyéb vészhelyzeti jelentéseinek küldése"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"ETWS sugárzás megszakításának küldése"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"ETWS tesztsugárzás küldése"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"A CMAS elnöki jelzésének küldése"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"CMAS extrém jelzés küldése"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"CMAS súlyos jelzés küldése"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"CMAS AMBER jelzés küldése"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"A CMAS havi kísérleti jelzésének küldése"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GMS 7 bit küldése – tesztsugárzás"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 bit küldése – tesztsugárzás"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GMS 7 bit küldése – teljes hosszúságú sugárzás"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 bit küldése – teljes hosszúságú sugárzás"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 bit küldése – többoldalas sugárzás"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 bit küldése – többoldalas sugárzás"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7 bit küldése nyelvvel együtt"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"GSM 7 bit küldése nyelvvel együtt a törzsben"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7 bit küldése nyelvvel együtt"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 küldése – tesztsugárzás"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 küldése – tesztsugárzás"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 küldése – többoldalas sugárzás"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"GSM UCS-2 küldése nyelvvel együtt"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"UMTS UCS-2 küldése nyelvvel együtt"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"5 másodperces késleltetés küldés előtt"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Üzenetazonosító:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategória:"</string>
 </resources>
diff --git a/tests/testapp/res/values-hy-rAM/strings.xml b/tests/testapp/res/values-hy-rAM/strings.xml
deleted file mode 100644
index 032b763..0000000
--- a/tests/testapp/res/values-hy-rAM/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Բջջային հեռարձակման փորձարկումներ"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Ուղարկել ETWS Սովորական հեռարձակում"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Ուղարկել ETWS չեղարկման հեռարձակում"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Ուղարկել ETWS փորձնական հեռարձակում"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Ուղարկել CMAS նախագահական ահազանգ"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Ուղարկել CMAS ծայրահեղ ահազանգ"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Ուղարկել CMAS խիստ ահազանգ"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Ուղարկել AMBER ծանուցում CMAS-ի միջոցով"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Ուղարկել CMAS ամսական փորձնական ահազանգ"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Ուղարկել GSM 7 բիթ փորձնական հեռարձակում"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Ուղարկել UMTS 7 բիթ փորձնական հեռարձակում"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Ուղարկել GSM 7 բիթ ամբողջական հեռարձակում"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Ուղարկել UMTS 7 բիթ ամբողջական հեռարձակում"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Ուղարկել GSM 7 բիթ բազմաէջ հեռարձակում"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Ուղարկել UMTS 7 բիթ բազմաէջ հեռարձակում"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Ուղարկել GSM 7 բիթ՝ լեզվական"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Ուղարկել GSM 7 բիթ՝ լեզվական գրվածքով"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Ուղարկել UMTS 7 բիթ՝ լեզվական"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Ուղարկել GSM UCS-2 փորձնական հեռարձակում"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Ուղարկել UMTS UCS-2 փորձնական հեռարձակում"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Ուղարկել UMTS UCS-2 բազմաէջ հեռարձակում"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Ուղարկել GSM UCS-2՝ լեզվական"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Ուղարկել UMTS UCS-2՝ լեզվական"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Նախքան առաքումը սպասել 5 վայրկյան"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Հաղորդագրության ID՝"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Բաժին՝"</string>
-</resources>
diff --git a/tests/testapp/res/values-hy/strings.xml b/tests/testapp/res/values-hy/strings.xml
new file mode 100644
index 0000000..fd2b703
--- /dev/null
+++ b/tests/testapp/res/values-hy/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Բջջային հեռարձակման փորձարկումներ"</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>
+    <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_extreme_alert" msgid="5922644977169679386">"Ուղարկել CMAS ծայրահեղ ահազանգ"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Ուղարկել CMAS խիստ ահազանգ"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Ուղարկել AMBER ծանուցում CMAS-ի միջոցով"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Ուղարկել CMAS ամսական փորձնական ահազանգ"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Ուղարկել GSM 7 բիթ փորձնական հեռարձակում"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Ուղարկել UMTS 7 բիթ փորձնական հեռարձակում"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Ուղարկել GSM 7 բիթ ամբողջական հեռարձակում"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Ուղարկել UMTS 7 բիթ ամբողջական հեռարձակում"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Ուղարկել GSM 7 բիթ բազմաէջ հեռարձակում"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Ուղարկել UMTS 7 բիթ բազմաէջ հեռարձակում"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Ուղարկել GSM 7 բիթ՝ լեզվական"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Ուղարկել GSM 7 բիթ՝ լեզվական գրվածքով"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Ուղարկել UMTS 7 բիթ՝ լեզվական"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Ուղարկել GSM UCS-2 փորձնական հեռարձակում"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Ուղարկել UMTS UCS-2 փորձնական հեռարձակում"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Ուղարկել UMTS UCS-2 բազմաէջ հեռարձակում"</string>
+    <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">"Նախքան առաքումը սպասել 5 վայրկյան"</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-in/strings.xml b/tests/testapp/res/values-in/strings.xml
index ac87940..003c427 100644
--- a/tests/testapp/res/values-in/strings.xml
+++ b/tests/testapp/res/values-in/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Uji Siaran Sel"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Kirim Siaran Normal ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Kirim Siaran Pembatalan ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Kirim Siaran Uji Coba ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Kirim Peringatan Presidensial CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Kirim Peringatan Ekstrem CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Kirim Peringatan Parah CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Kirim Peringatan AMBER CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Kirim Tes Bulanan Peringatan CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Kirim Siaran Uji Coba GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Kirim Siaran Uji Coba UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Kirim Siaran Penuh GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Kirim Siaran Penuh UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Kirim Siaran Multilaman GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Kirim Siaran Multilaman UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Kirim GSM Bit 7 Dengan Bahasa"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Kirim GSM 7 Bit Dengan Bahasa Dalam Tubuh"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Kirim UMTS 7 Bit Dengan Bahasa"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Kirim Siaran Uji Coba GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Kirim Siaran Uji Coba UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Kirim Siaran Multilaman UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Kirimkan GSM UCS-2 Dengan Bahasa"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Kirim UMTS UCS-2 Dengan Bahasa"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Tunda 5 detik sebelum mengirim"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID Pesan:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategori:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Uji Siaran Sel"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Kirim Siaran Gempa ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Kirim Siaran Tsunami ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Kirim Siaran Gempa dan Tsunami ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Kirim Siaran Darurat ETWS Lainnya"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Kirim Siaran Pembatalan ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Kirim Siaran Uji Coba ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Kirim Peringatan Presidensial CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Kirim Peringatan Ekstrem CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Kirim Peringatan Parah CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Kirim Peringatan AMBER CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Kirim Peringatan Uji Bulanan CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Kirim Siaran Uji Coba GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Kirim Siaran Uji Coba UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Kirim Siaran Penuh GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Kirim Siaran Penuh UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Kirim Siaran Multilaman GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Kirim Siaran Multilaman UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Kirim GSM 7 Bit Dengan Bahasa"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Kirim GSM 7 Bit Dengan Bahasa Dalam Tubuh"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Kirim UMTS 7 Bit Dengan Bahasa"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Kirim Siaran Uji Coba GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Kirim Siaran Uji Coba UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Kirim Siaran Multilaman UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Kirim GSM UCS-2 Dengan Bahasa"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Kirim UMTS UCS-2 Dengan Bahasa"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Tunda 5 detik sebelum mengirim"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID Pesan:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategori:"</string>
 </resources>
diff --git a/tests/testapp/res/values-is-rIS/strings.xml b/tests/testapp/res/values-is-rIS/strings.xml
deleted file mode 100644
index 49529bd..0000000
--- a/tests/testapp/res/values-is-rIS/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Prófanir skilaboða frá endurvarpa"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Senda venjuleg ETWS-skilaboð"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Senda ETWS-afturköllun"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Senda ETWS-prufuskilaboð"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Senda viðvörun frá forseta með CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Senda CMAS-viðvörun á háu stigi"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Senda alvarlega CMAS-viðvörun"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Senda AMBER-viðvörun með CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Senda mánaðarlega CMAS-prufuviðvörun"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Senda 7 bita GSM-prufuskilaboð"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Senda 7 bita UMTS-prufuskilaboð"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Senda 7 bita GSM-skilaboð í fullri lengd"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Senda 7 bita UMTS-skilaboð í fullri lengd"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Senda 7 bita GSM-fjölsíðuskilaboð"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Senda 7 bita UMTS-fjölsíðuskilaboð"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Senda 7 bita GSM-skilaboð með tungumáli"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Senda 7 bita GSM-skilaboð með tungumáli í meginmáli"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Senda 7 bita UMTS-skilaboð með tungumáli"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Senda GSM-fjölsíðuskilaboð með UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Senda UMTS-prufuskilaboð með UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Senda UMTS-fjölsíðuskilaboð með UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Senda GSM UCS-2 með tungumáli"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Senda UMTS UCS-2 með tungumáli"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Bíða í 5 sekúndur áður en sent er"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Auðkenni skilaboða:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Flokkur:"</string>
-</resources>
diff --git a/tests/testapp/res/values-is/strings.xml b/tests/testapp/res/values-is/strings.xml
new file mode 100644
index 0000000..292cf70
--- /dev/null
+++ b/tests/testapp/res/values-is/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Prófanir skilaboða frá endurvarpa"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Senda ETWS-útsendingu fyrir jarðskjálfta"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Senda ETWS-útsendingu fyrir flóðbylgju"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Senda ETWS-útsendingu fyrir jarðskjálfta og flóðbylgju"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Senda ETWS-útsendingu fyrir önnur neyðartilfelli"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Senda ETWS-afturköllun"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Senda ETWS-prufuskilaboð"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Senda viðvörun frá forseta með CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Senda CMAS-viðvörun á háu stigi"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Senda alvarlega CMAS-viðvörun"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Senda AMBER-viðvörun með CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Senda mánaðarlega CMAS-prufuviðvörun"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Senda 7 bita GSM-prufuskilaboð"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Senda 7 bita UMTS-prufuskilaboð"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Senda 7 bita GSM-skilaboð í fullri lengd"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Senda 7 bita UMTS-skilaboð í fullri lengd"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Senda 7 bita GSM-fjölsíðuskilaboð"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Senda 7 bita UMTS-fjölsíðuskilaboð"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Senda 7 bita GSM-skilaboð með tungumáli"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Senda 7 bita GSM-skilaboð með tungumáli í meginmáli"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Senda 7 bita UMTS-skilaboð með tungumáli"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Senda GSM-prufuskilaboð með UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Senda UMTS-prufuskilaboð með UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Senda UMTS-fjölsíðuskilaboð með UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Senda GSM-skilaboð með UCS-2 með tungumáli"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Senda UMTS-skilaboð með UCS-2 með tungumáli"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Bíða í fimm sekúndur áður en sent er"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Auðkenni skilaboða:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Flokkur:"</string>
+</resources>
diff --git a/tests/testapp/res/values-it/strings.xml b/tests/testapp/res/values-it/strings.xml
index ade32d4..933eb3f 100644
--- a/tests/testapp/res/values-it/strings.xml
+++ b/tests/testapp/res/values-it/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Test cell broadcast"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Invia trasmissione ETWS normale"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Invia broadcast di annullamento ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Invia broadcast di prova ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Invia avviso presidenziale CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Invia avviso estremo CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Invia avviso grave CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Invia avviso AMBER CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Invia avviso di prova mensile CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Invia broadcast di prova GSM 7 bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Invia broadcast di prova UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Invia broadcast completo GSM 7 bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Invia broadcast completo UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Invia broadcast multipagina GSM 7 bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Invia broadcast multipagina UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Invia GSM 7 bit con lingua"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Invia GSM 7 bit con lingua nel corpo"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Invia UMTS 7 bit con lingua"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Invia broadcast di prova GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Invia broadcast di prova UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Invia broadcast multipagina UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Invia GSM UCS-2 con lingua"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Invia UMTS UCS-2 con lingua"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Ritarda 5 secondi prima di inviare"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID messaggio:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categoria:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Test cell broadcast"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Invia broadcast di terremoto ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Invia broadcast di tsunami ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Invia broadcast di terremoto e tsunami ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Invia broadcast per altre emergenze ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Invia broadcast di annullamento ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Invia broadcast di prova ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Invia avviso presidenziale CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Invia avviso estremo CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Invia avviso grave CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Invia avviso AMBER CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Invia avviso di prova mensile CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Invia broadcast di prova GSM 7 bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Invia broadcast di prova UMTS 7 bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Invia broadcast completo GSM 7 bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Invia broadcast completo UMTS 7 bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Invia broadcast multipagina GSM 7 bit"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Invia broadcast multipagina UMTS 7 bit"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Invia GSM 7 bit con lingua"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Invia GSM 7 bit con lingua nel corpo"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Invia UMTS 7 bit con lingua"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Invia broadcast di prova GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Invia broadcast di prova UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Invia broadcast multipagina UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Invia GSM UCS-2 con lingua"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Invia UMTS UCS-2 con lingua"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Ritarda 5 secondi prima di inviare"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID messaggio:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categoria:"</string>
 </resources>
diff --git a/tests/testapp/res/values-iw/strings.xml b/tests/testapp/res/values-iw/strings.xml
index 7ce34cf..e417ae0 100644
--- a/tests/testapp/res/values-iw/strings.xml
+++ b/tests/testapp/res/values-iw/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"בדיקות שידור סלולרי"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"‏שלח שידור ETWS רגיל"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"‏שלח ביטול שידור ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"‏שלח שידור בדיקה מסוג ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"‏שלח התראת CMAS נשיאותית"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"‏שלח התראת CMAS קיצונית"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"‏שלח התראת CMAS חמורה"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"‏שלח התראת CMAS ‏AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"‏שלח התראת בדיקה חודשית של CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"‏שלח שידור בדיקה מסוג GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"‏שלח שידור בדיקה מסוג UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"‏שלח שידור GSM 7 Bit באורך מלא"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"‏שלח שידור UMTS 7 Bit באורך מלא"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"‏שלח שידור GSM 7 Bit עם ריבוי דפים"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"‏שלח שידור UMTS 7 Bit עם ריבוי דפים"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"‏שלח GSM 7 Bit עם שפה"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"‏שלח ‏7 ביט ב-GSM עם שפה בגוף"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"‏שלח UMTS 7 Bit עם שפה"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"‏שלח שידור בדיקה מסוג GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"‏שלח UMTS UCS-2 שידור מבחן"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"‏שלח שידור UMTS UCS-2 עם ריבוי דפים"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"‏שלח GSM UCS-2 עם שפה"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"‏שלח UMTS UCS-2 עם שפה"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"עיכוב של 5 שניות לפני שליחה"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"מזהה הודעה:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"קטגוריה:"</string>
+    <string name="app_label" msgid="2704349695846064655">"בדיקות שידור סלולרי"</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>
+    <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_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 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>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"‏שלח שידור UMTS 7 Bit באורך מלא"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"‏שלח שידור GSM 7 Bit עם ריבוי דפים"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"‏שלח שידור UMTS 7 Bit עם ריבוי דפים"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"‏שלח GSM 7 Bit עם שפה"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"‏שלח GSM 7 Bit עם שפה בגוף"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"‏שלח UMTS 7 Bit עם שפה"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"‏שלח שידור בדיקה מסוג GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"‏שלח שידור בדיקה מסוג UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"‏שלח שידור UMTS UCS-2 עם ריבוי דפים"</string>
+    <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">"עיכוב של 5 שניות לפני שליחה"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"מזהה הודעה:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"קטגוריה:"</string>
 </resources>
diff --git a/tests/testapp/res/values-ja/strings.xml b/tests/testapp/res/values-ja/strings.xml
index 9866894..b6ed42d 100644
--- a/tests/testapp/res/values-ja/strings.xml
+++ b/tests/testapp/res/values-ja/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"緊急警報のテスト"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS標準放送を送信"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWSキャンセルブロードキャストを送信"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWSテストブロードキャストを送信"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMASの国家レベルの警報を送信"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMASの最重要警報を送信"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMASの重要警報を送信"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMASの誘拐事件速報を送信"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMASの毎月のテスト警報を送信"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7-bitテストブロードキャストを送信"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7-bitテストブロードキャストを送信"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7-bitフルレングスブロードキャストを送信"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7-bitフルレングスブロードキャストを送信"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7-bitマルチページブロードキャストを送信"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7-bitマルチページブロードキャストを送信"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"言語と共にGSM 7-bitを送信"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"本文の言語と共にGSM 7-bitを送信"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"言語と共にUMTS 7-bitを送信"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2テストブロードキャストを送信"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2テストブロードキャストを送信"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2マルチページブロードキャストを送信"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"言語と共にGSM UCS-2を送信"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"言語と共にUMTS UCS-2を送信"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"送信を5秒遅らせる"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"メッセージID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"カテゴリ:"</string>
+    <string name="app_label" msgid="2704349695846064655">"緊急速報メールのテスト"</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>
+    <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_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>
+    <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>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7-bit フルレングス ブロードキャストを送信"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7-bit マルチページ ブロードキャストを送信"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7-bit マルチページ ブロードキャストを送信"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"言語と共に GSM 7-bit を送信"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"本文の言語と共に GSM 7-bit を送信"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"言語と共に UMTS 7-bit を送信"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 テスト ブロードキャストを送信"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 テスト ブロードキャストを送信"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 マルチページ ブロードキャストを送信"</string>
+    <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">"送信を 5 秒遅らせる"</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-ka-rGE/strings.xml b/tests/testapp/res/values-ka-rGE/strings.xml
deleted file mode 100644
index 87a6cf7..0000000
--- a/tests/testapp/res/values-ka-rGE/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"სამაუწყებლო შეტყობინებების ტესტები"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS Normal Broadcast-ის გაგზავნა"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS Cancel Broadcast-ის გაგზავნა"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS Test Broadcast-ის გაგზავნა"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"პრეზიდენტის მიერ გამოცხადებული CMAS გაფრთხილების გაგზავნა"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS უკიდურესი საფრთხის შესახებ გაფრთხილების გაგზავნა"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"სერიოზული საფრთხის შესახებ CMAS გაფრთხილების გაგზავნა"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS „AMBER Alert“-ის გაგზავნა"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS გაფრთხილების ყოველთვიური ტესტის გაგზავნა"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 Bit Test Broadcas-ის გაგზავნა"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 Bit Test Broadcast-ის გაგზავნა"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 Bit Full Length Broadcast-ის გაგზავნა"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 Bit Full Length Broadcast-ის გაგზავნა"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 Bit Multi Page Broadcast-ის გაგზავნა"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 Bit Multi Page Broadcast-ის გაგზავნა"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 Bit With Language-ის გაგზავნა"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM 7 Bit With Language In Body-ს გაგზავნა"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 Bit With Language-ის გაგზავნა"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 Test Broadcast-ის გაგზავნა"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 Test Broadcast-ის გაგზავნა"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 Multi Page Broadcast-ის გაგზავნა"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 With Language-ის გაგზავნა"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 With Language-ის გაგზავნა"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"გაგზავნამდე 5 წამით დაყოვნება"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"შეტყობინების ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"კატეგორია:"</string>
-</resources>
diff --git a/tests/testapp/res/values-ka/strings.xml b/tests/testapp/res/values-ka/strings.xml
new file mode 100644
index 0000000..714c0c8
--- /dev/null
+++ b/tests/testapp/res/values-ka/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Cell Broadcast ტესტები"</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>
+    <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_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 AMBER გაფრთხილების გაგზავნა"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"ყოველთვიური სატესტო CMAS გაფრთხილების გაგზავნა"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"სატესტო 7-ბიტიანი GSM შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"სატესტო 7-ბიტიანი UMTS შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"სრული სიგრძის 7-ბიტიანი GSM შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"სრული სიგრძის 7-ბიტიანი UMTS შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"მრავალგვერდიანი 7-ბიტიანი GSM შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"მრავალგვერდიანი 7-ბიტიანი UMTS შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"7-ბიტიანი GSM შეტყობინების დაგზავნა ენის მითითებით"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"7-ბიტიანი GSM შეტყობინების დაგზავნა ტექსტში ენის მითითებით"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"7-ბიტიანი UMTS შეტყობინების დაგზავნა ენის მითითებით"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"სატესტო UCS-2 GSM შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"სატესტო UCS-2 UMTS შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"მრავალგვერდიანი UCS-2 UMTS შეტყობინების დაგზავნა"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"UCS-2 GSM შეტყობინების დაგზავნა ენის მითითებით"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"UCS-2 UMTS შეტყობინების დაგზავნა ენის მითითებით"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"გაგზავნამდე 5 წამით დაყოვნება"</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-kk-rKZ/strings.xml b/tests/testapp/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index 1e597db..0000000
--- a/tests/testapp/res/values-kk-rKZ/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Ұялы таратылым сынақтары"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS қалыпты таратылымын жіберу"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS болдырмау таратылымын жіберу"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS сынақ таратылымын жіберу"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS президенттік дабылын жіберу"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS аса маңызды дабылын жіберу"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS елеулі дабылын жіберу"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS САРЫ дабылын жіберу"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS айлық сынақ дабылын жіберу"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 бит сынақ таратылымын жіберу"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 бит сынақ таратылымын жіберу"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 бит толық ұзындықтағы таратылымын жіберу"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 бит толық ұзындықтағы таратылымын жіберу"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 бит көп беттік таратылымын жіберу"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 бит көп беттік таратылымын жіберу"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 бит тіл қамтылған хабар жіберу"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM 7 бит негізгі мәтінде тіл қамтылған хабар жіберу"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 бит негізгі мәтінде тіл қамтылған хабар жіберу"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 сынақ таратылымын жіберу"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 сынақ таратылымын жіберу"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 көп беттік таратылым жіберу"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 тіл қамтылған хабарын жіберу"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 тіл қамтылған хабарын жіберу"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Жіберуден 5 секунд алдын кідірту"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Хабар идентификаторы:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Санат:"</string>
-</resources>
diff --git a/tests/testapp/res/values-kk/strings.xml b/tests/testapp/res/values-kk/strings.xml
new file mode 100644
index 0000000..d1603b9
--- /dev/null
+++ b/tests/testapp/res/values-kk/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Ұялы таратылым сынақтары"</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>
+    <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_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 AMBER дабылын жіберу"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS айлық сынақ дабылын жіберу"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 бит сынақ таратылымын жіберу"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 бит сынақ таратылымын жіберу"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 бит толық таратылымын жіберу"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 бит толық таратылымын жіберу"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 бит көп беттік таратылымын жіберу"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 бит көп беттік таратылымын жіберу"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Тіл көрсетілген GSM 7 бит хабарын жіберу"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Негізгі мәтінде тіл көрсетілген GSM 7 бит хабарын жіберу"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Негізгі мәтінде тіл көрсетілген UMTS 7 бит хабарын жіберу"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 сынақтық таратылымын жіберу"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 сынақтық таратылымын жіберу"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 көп беттік таратылымын жіберу"</string>
+    <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">"5 секундқа кешіктіріп жіберу"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Хабар идентификаторы:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Санаты:"</string>
+</resources>
diff --git a/tests/testapp/res/values-km-rKH/strings.xml b/tests/testapp/res/values-km-rKH/strings.xml
deleted file mode 100644
index 45afacd..0000000
--- a/tests/testapp/res/values-km-rKH/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"សាកល្បង​ការ​ផ្សាយ​ចល័ត"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ផ្ញើ​ការ​ផ្សាយ​ធម្មតា ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ផ្ញើ​ការ​ផ្សាយ​បោះបង់ ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ផ្ញើ​ការ​ផ្សាយ​សាកល្បង ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"ផ្ញើ​ការ​ជូន​ដំណឹង​ផ្លូវការ CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"ផ្ញើ​ការ​ជូន​ដំណឹង​ខ្លាំង CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"ផ្ញើ​ការ​ជូន​ដំណឹង​ធ្ងន់ធ្ងរ CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"ផ្ញើ​ការ​ជូន​ដំណឹង​ពណ៌លឿង CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"ផ្ញើ​ការ​ជូន​ដំណឹង​សាកល្បង​ប្រចាំខែ CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"ផ្ញើ​ការ​ផ្សាយ​សាកល្បង GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"ផ្ញើ​ការ​ផ្សាយ​សាកល្បង UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"ផ្ញើ​ការ​ផ្សាយ​ប្រវែង​ពេញលេញ GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"ផ្ញើ​ការ​ផ្សាយ​ប្រវែង​ពេញលេញ UMTS 7"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"ផ្ញើ​ការ​ផ្សាយ​​ច្រើន​ទំព័រ GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"ផ្ញើ​ការ​ផ្សាយ​ច្រើន​ទំព័រ UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"ផ្ញើ GSM 7 Bit មាន​ភាសា"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"ផ្ញើ​ GSM 7 Bit មាន​ភាសា​ក្នុង​តួ"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"ផ្ញើ UMTS 7 Bit មាន​ភាសា"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"ផ្ញើ​ការ​ផ្សាយ​សាកល្បង GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"ផ្ញើ​ការ​ផ្សាយ​សាកល្បង UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"ផ្ញើ​ការ​ផ្សាយ​ច្រើន​ទំព័រ UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"ផ្ញើ GSM UCS-2 មាន​ភាសា"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"ផ្ញើ UMTS UCS-2 មាន​ភាសា"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"ពន្យារ ៥ វិនាទី​មុន​ពេល​​​​ផ្ញើ"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"លេខ​សម្គាល់​សារ​៖"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"ប្រភេទ៖"</string>
-</resources>
diff --git a/tests/testapp/res/values-km/strings.xml b/tests/testapp/res/values-km/strings.xml
new file mode 100644
index 0000000..bedb15c
--- /dev/null
+++ b/tests/testapp/res/values-km/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"សាកល្បង​ការ​ផ្សាយ​ចល័ត"</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>
+    <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_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>
+    <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>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"ផ្ញើ​ការ​ផ្សាយ​ប្រវែង​ពេញលេញ UMTS 7"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"ផ្ញើ​ការ​ផ្សាយ​​ច្រើន​ទំព័រ GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"ផ្ញើ​ការ​ផ្សាយ​ច្រើន​ទំព័រ UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"ផ្ញើ GSM 7 Bit មាន​ភាសា"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"ផ្ញើ​ GSM 7 Bit មាន​ភាសា​ក្នុង​តួ"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"ផ្ញើ UMTS 7 Bit មាន​ភាសា"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"ផ្ញើ​ការ​ផ្សាយ​សាកល្បង GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"ផ្ញើ​ការ​ផ្សាយ​សាកល្បង UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"ផ្ញើ​ការ​ផ្សាយ​ច្រើន​ទំព័រ UMTS UCS-2"</string>
+    <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">"លេខ​សម្គាល់​សារ​៖"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"ប្រភេទ៖"</string>
+</resources>
diff --git a/tests/testapp/res/values-kn-rIN/strings.xml b/tests/testapp/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 71649d5..0000000
--- a/tests/testapp/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"ಸೆಲ್ ಪ್ರಸಾರ ಪರೀಕ್ಷೆಗಳು"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS ಸಾಮಾನ್ಯ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS ರದ್ದು ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS ಅಧ್ಯಕ್ಷೀಯ ಎಚ್ಚರಿಕೆ ಕಳುಹಿಸು"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS ತೀವ್ರ ಎಚ್ಚರಿಕೆ ಕಳುಹಿಸು"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS ಗಂಭೀರ ಎಚ್ಚರಿಕೆ ಕಳುಹಿಸು"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER ಎಚ್ಚರಿಕೆ ಕಳುಹಿಸು"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS ಮಾಸಿಕ ಪರೀಕ್ಷಾ ಎಚ್ಚರಿಕೆ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 ಬಿಟ್ ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 ಬಿಟ್ ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 ಬಿಟ್ ಪೂರ್ಣ ಪ್ರಮಾಣದ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 ಬಿಟ್ ಪೂರ್ಣ ಪ್ರಮಾಣದ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 ಬಿಟ್ ಬಹು ಪುಟ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 ಬಿಟ್ ಬಹು ಪುಟ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"ಭಾಷೆಯೊಂದಿಗೆ GSM 7 ಬಿಟ್ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"ಮೇಲ್ಮೈನಲ್ಲಿ ಭಾಷೆಯೊಂದಿಗೆ GSM 7 ಬಿಟ್ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"ಭಾಷೆಯೊಂದಿಗೆ UMTS 7 ಬಿಟ್ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 ಬಹು ಪುಟ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"ಭಾಷೆಯೊಂದಿಗೆ GSM UCS-2 ಕಳುಹಿಸು"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"ಭಾಷೆಯೊಂದಿಗೆ UMTS UCS-2 ಕಳುಹಿಸು"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"ಕಳುಹಿಸುವ ಮುನ್ನ 5 ಸೆಕೆಂಡುಗಳು ವಿಳಂಬ ಮಾಡು"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ಸಂದೇಶದ ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"ವರ್ಗ:"</string>
-</resources>
diff --git a/tests/testapp/res/values-kn/strings.xml b/tests/testapp/res/values-kn/strings.xml
new file mode 100644
index 0000000..6d9bc3e
--- /dev/null
+++ b/tests/testapp/res/values-kn/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"ಸೆಲ್ ಪ್ರಸಾರ ಪರೀಕ್ಷೆಗಳು"</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>
+    <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_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 AMBER ಎಚ್ಚರಿಕೆ ಕಳುಹಿಸು"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS ಮಾಸಿಕ ಪರೀಕ್ಷಾ ಎಚ್ಚರಿಕೆ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 ಬಿಟ್ ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 ಬಿಟ್ ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 ಬಿಟ್ ಪೂರ್ಣ ಪ್ರಮಾಣದ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 ಬಿಟ್ ಪೂರ್ಣ ಪ್ರಮಾಣದ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 ಬಿಟ್ ಬಹು ಪುಟ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 ಬಿಟ್ ಬಹು ಪುಟ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"ಭಾಷೆಯೊಂದಿಗೆ GSM 7 ಬಿಟ್ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"ಮೇಲ್ಮೈನಲ್ಲಿ ಭಾಷೆಯೊಂದಿಗೆ GSM 7 ಬಿಟ್ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"ಭಾಷೆಯೊಂದಿಗೆ UMTS 7 ಬಿಟ್ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 ಪರೀಕ್ಷಾ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 ಬಹು ಪುಟ ಪ್ರಸಾರ ಕಳುಹಿಸು"</string>
+    <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">"ಕಳುಹಿಸುವ ಮುನ್ನ 5 ಸೆಕೆಂಡುಗಳು ವಿಳಂಬ ಮಾಡು"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ಸಂದೇಶ ಐಡಿ:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"ವರ್ಗ:"</string>
+</resources>
diff --git a/tests/testapp/res/values-ko/strings.xml b/tests/testapp/res/values-ko/strings.xml
index 2899375..e6103d0 100644
--- a/tests/testapp/res/values-ko/strings.xml
+++ b/tests/testapp/res/values-ko/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"셀 브로드캐스트 테스트"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS 일반 브로드캐스트 전송"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS 취소 브로드캐스트 보내기"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS 테스트 브로드캐스트 보내기"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS 대통령 경보 보내기"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS 긴급 경보 보내기"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS 위험 경보 보내기"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS 황색 경보 보내기"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS 월별 테스트 경보 보내기"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7비트 테스트 브로드캐스트 보내기"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7비트 테스트 브로드캐스트 보내기"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7비트 전체 길이 브로드캐스트 보내기"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7비트 전체 길이 브로드캐스트 보내기"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7비트 멀티 페이지 브로드캐스트 보내기"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7비트 멀티 페이지 브로드캐스트 보내기"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"언어와 함께 GSM 7비트 보내기"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"신체 언어와 함께 GSM 7비트 보내기"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"언어와 UMTS 7비트 보내기"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 테스트 브로드캐스트 보내기"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 테스트 브로드캐스트 보내기"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 멀티 페이지 브로드캐스트 보내기"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"언어와 GSM UCS-2를 전송"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"언어와 UMTS UCS-2 보내기"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"보내기 전에 5초 지연"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"메시지 ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"카테고리:"</string>
+    <string name="app_label" msgid="2704349695846064655">"셀 브로드캐스트 테스트"</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>
+    <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_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>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS 월별 테스트 경보 보내기"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7비트 테스트 브로드캐스트 보내기"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7비트 테스트 브로드캐스트 보내기"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7비트 전체 길이 브로드캐스트 보내기"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7비트 전체 길이 브로드캐스트 보내기"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7비트 멀티 페이지 브로드캐스트 보내기"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7비트 멀티 페이지 브로드캐스트 보내기"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"언어와 함께 GSM 7비트 보내기"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"신체 언어와 함께 GSM 7비트 보내기"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"언어와 함께 UMTS 7비트 보내기"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 테스트 브로드캐스트 보내기"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 테스트 브로드캐스트 보내기"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 멀티 페이지 브로드캐스트 보내기"</string>
+    <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">"보내기 전에 5초 지연"</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-ky-rKG/strings.xml b/tests/testapp/res/values-ky-rKG/strings.xml
deleted file mode 100644
index 721d1da..0000000
--- a/tests/testapp/res/values-ky-rKG/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Сыналып жаткан уюк таркатмалары"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS кадимки уюк таркатмасын жөнөтүү"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS жокко чыгаруу уюк таркатмасын жөнөтүү"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS сынамык уюк таркатмасын жөнөтүү"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Бүткүл республикалык CMAS айгайын жөнөтүү"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Өтө коркунучтуу кырдаал жөнүндө CMAS айгай кабарын жөнөтүү"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Олуттуу кырдаал жөнүндө CMAS айгай кабарын жөнөтүү"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER айгай кабарын жөнөтүү"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Ай сайын сыналуучу CMAS айгай кабарын жөнөтүү"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"7 биттик GSM сынамык уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"7 биттик UMTS сынамык уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"7 биттик GSM толук узундуктагы уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"7 биттик UMTS толук узундуктагы уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"7 биттик GSM бир нече беттүү уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"7 биттик UMTS бир нече беттүү уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Тил камтылган 7 биттик GSM жөнөтүү"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Ичинде тил камтылган 7 биттик GSM жөнөтүү"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Тил камтылган 7 биттик UMTS жөнөтүү"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 сыналып жаткан уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 сыналып жаткан уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Бир нече беттүү UMTS UCS-2 уюк таркатмасын жөнөтүү"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 тил менен кошо жөнөтүү"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 тил менен кошо жөнөтүү"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"5 секунд кармап туруп жөнөтүү"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Билдирүүнүн далдаштыргычы:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Категория:"</string>
-</resources>
diff --git a/tests/testapp/res/values-ky/strings.xml b/tests/testapp/res/values-ky/strings.xml
new file mode 100644
index 0000000..dae02a1
--- /dev/null
+++ b/tests/testapp/res/values-ky/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Уюк таркатмаларын сыноо"</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>
+    <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_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 AMBER айгай кабарын жөнөтүү"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Ай сайын сыналуучу CMAS айгай кабарын жөнөтүү"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"7 биттик GSM сынамык уюк таркатмасын жөнөтүү"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"7 биттик UMTS сынамык уюк таркатмасын жөнөтүү"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"7 биттик GSM толук узундуктагы уюк таркатмасын жөнөтүү"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"7 биттик UMTS толук узундуктагы уюк таркатмасын жөнөтүү"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"7 биттик GSM бир нече беттүү уюк таркатмасын жөнөтүү"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"7 биттик UMTS бир нече беттүү уюк таркатмасын жөнөтүү"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Тил тандоо мүмкүнчүлүгү камтылган 7 биттик GSM жөнөтүү"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Тил тандоо мүмкүнчүлүгү камтылган 7 биттик GSM жөнөтүү"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Тил тандоо мүмкүнчүлүгү камтылган 7 биттик UMTS жөнөтүү"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Сыналып жаткан GSM UCS-2 уюк таркатмасын жөнөтүү"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Сыналып жаткан UMTS UCS-2 уюк таркатмасын жөнөтүү"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Бир нече беттүү UMTS UCS-2 уюк таркатмасын жөнөтүү"</string>
+    <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">"5 секунд кармап туруп жөнөтүү"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Билдирүүнүн идентификатору:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Категория:"</string>
+</resources>
diff --git a/tests/testapp/res/values-lo-rLA/strings.xml b/tests/testapp/res/values-lo-rLA/strings.xml
deleted file mode 100644
index b5b991f..0000000
--- a/tests/testapp/res/values-lo-rLA/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"ການທົດສອບການກະຈາຍຂໍ້ມູນ"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ສົ່ງການກະຈາຍຂໍ້ມູນ ETWS ປົກກະຕິ"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ສົ່ງການກະຈາຍຂໍ້ມູນຍົກເລີກ ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ສົ່ງການກະຈາຍຂໍ້ມູນທົດສອບ ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"ສົ່ງການແຈ້ງເຕືອນ CMAS ໂດຍປະທານາທິບໍດີ"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"ສົ່ງການແຈ້ງເຕືອນ CMAS ສຸກເສີນ"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"ສົ່ງການແຈ້ງເຕືອນຮຸນແຮງ CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"ສົ່ງການແຈ້ງເຕືອນ CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"ສົ່ງການທົດສອບແຈ້ງເຕືອນ CMAS ປະຈຳເດືອນ"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"ສົ່ງການກະຈາຍຂໍ້ມູນທົດສອບ GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"ສົ່ງການກະຈາຍຂໍ້ມູນທົດສອບ UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"ສົ່ງການກະຈາຍຂໍ້ມູນ GSM 7 Bit Full Length"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"ສົ່ງການກະຈາຍຂໍ້ມູນ UMTS 7 Bit Full Length"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"ສົ່ງການກະຈາຍຂໍ້ມູນ GSM 7 Bit Multi Page"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"ສົ່ງການກະຈາຍຂໍ້ມູນ UMTS 7 Bit Multi Page"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"ສົ່ງ GSM 7 Bit ພ້ອມພາສາ"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"ສົ່ງ GSM 7 Bit ພ້ອມພາສາໃນເນື້ອຄວາມ"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"ສົ່ງ UMTS 7 Bit ພ້ອມພາສາ"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"ສົ່ງການກະຈາຍທົດສອບ GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"ສົ່ງການກະຈາຍທົດສອບ UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"ສົ່ງການກະຈາຍ UMTS UCS-2 Multi Page"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"ສົ່ງການກະຈາຍທົດສອບ GSM UCS-2 ພ້ອມພາສາ"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"ສົ່ງການກະຈາຍທົດສອບ UMTS UCS-2 ພ້ອມພາສາ"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"ເວັ້ນ 5 ວິນາທີກ່ອນການສົ່ງ"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ລະຫັດຂໍ້ຄວາມ:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"ໝວດໝູ່:"</string>
-</resources>
diff --git a/tests/testapp/res/values-lo/strings.xml b/tests/testapp/res/values-lo/strings.xml
new file mode 100644
index 0000000..c00594a
--- /dev/null
+++ b/tests/testapp/res/values-lo/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"ການທົດສອບການກະຈາຍຂໍ້ມູນ"</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>
+    <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_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 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 Full Length"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"ສົ່ງການກະຈາຍຂໍ້ມູນ UMTS 7 Bit Full Length"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"ສົ່ງການກະຈາຍຂໍ້ມູນ GSM 7 Bit Multi Page"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"ສົ່ງການກະຈາຍຂໍ້ມູນ UMTS 7 Bit Multi Page"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"ສົ່ງ GSM 7 Bit ພ້ອມພາສາ"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"ສົ່ງ GSM 7 Bit ພ້ອມພາສາໃນເນື້ອຄວາມ"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"ສົ່ງ UMTS 7 Bit ພ້ອມພາສາ"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"ສົ່ງການກະຈາຍທົດສອບ GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"ສົ່ງການກະຈາຍທົດສອບ UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"ສົ່ງການກະຈາຍ UMTS UCS-2 Multi Page"</string>
+    <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">"ເວັ້ນ 5 ວິນາທີກ່ອນການສົ່ງ"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ໄອດີຂໍ້ຄວາມ:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"ໝວດໝູ່:"</string>
+</resources>
diff --git a/tests/testapp/res/values-lt/strings.xml b/tests/testapp/res/values-lt/strings.xml
index f78381d..a7c192a 100644
--- a/tests/testapp/res/values-lt/strings.xml
+++ b/tests/testapp/res/values-lt/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Tinklo transliacijos bandymai"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Siųsti ETWS įprastą transliaciją"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Siųsti ETWS atšaukimo transliaciją"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Siųsti ETWS bandomąją transliaciją"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Siųsti CMAS prezidentinį įspėjimą"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Siųsti CMAS ekstremalų įspėjimą"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Siųsti CMAS rimtą įspėjimą"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Siųsti CMAS AMBER įspėjimą"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Siųsti CMAS mėnesinį bandomąjį įspėjimą"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Siųsti GSM 7 bit. bandomąją transliaciją"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Siųsti UMTS 7 bit. bandomąją transliaciją"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Siųsti GSM 7 bit. visos trukmės transliaciją"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Siųsti UMTS 7 bit. visos trukmės transliaciją"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Siųsti GSM 7 bit. kelių puslapių transliaciją"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Siųsti UMTS 7 bit. kelių puslapių transliaciją"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Siųsti GSM 7 bit. su kalba"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Siųsti GSM 7 bit. su kalba turinyje"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Siųsti UMTS 7 bit. su kalba"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Siųsti GSM UCS-2 bandomąją transliaciją"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Siųsti UMTS UCS-2 bandomąją transliaciją"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Siųsti UMTS UCS-2 kelių puslapių transliaciją"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Siųsti GSM UCS-2 su kalba"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Siųsti UMTS UCS-2 su kalba"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Atidėti 5 sek. prieš siunčiant"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Pranešimo ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorija:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Transliacijos mobiliuoju bandymai"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Siųsti ETWS žemės drebėjimo transliaciją"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Siųsti ETWS cunamio transliaciją"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Siųsti ETWS žemės drebėjimo ir cunamio transliaciją"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Siųsti ETWS kitos nelaimės transliaciją"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Siųsti ETWS atšaukimo transliaciją"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Siųsti ETWS bandomąją transliaciją"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Siųsti CMAS prezidentinį įspėjimą"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Siųsti CMAS ekstremalų įspėjimą"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Siųsti CMAS rimtą įspėjimą"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Siųsti CMAS AMBER įspėjimą"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Siųsti CMAS mėnesinį bandomąjį įspėjimą"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Siųsti GSM 7 bitų bandomąją transliaciją"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Siųsti UMTS 7 bitų bandomąją transliaciją"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Siųsti GSM 7 bitų visos trukmės transliaciją"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Siųsti UMTS 7 bitų visos trukmės transliaciją"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Siųsti GSM 7 bitų kelių puslapių transliaciją"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Siųsti UMTS 7 bitų kelių puslapių transliaciją"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Siųsti GSM 7 bitų transliaciją su kalba"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Siųsti GSM 7 bitų transliaciją su kalba turinyje"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Siųsti UMTS 7 bitų transliaciją su kalba"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Siųsti GSM UCS-2 bandomąją transliaciją"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Siųsti UMTS UCS-2 bandomąją transliaciją"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Siųsti UMTS UCS-2 kelių puslapių transliaciją"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Siųsti GSM UCS-2 transliaciją su kalba"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Siųsti UMTS UCS-2 transliaciją su kalba"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Atidėti 5 sek. prieš siunčiant"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Pranešimo ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorija:"</string>
 </resources>
diff --git a/tests/testapp/res/values-lv/strings.xml b/tests/testapp/res/values-lv/strings.xml
index 5c86b5e..6729d7a 100644
--- a/tests/testapp/res/values-lv/strings.xml
+++ b/tests/testapp/res/values-lv/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Šūnu apraides testi"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Sūtīt ETWS parasto apraidi"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Sūtīt ETWS, pārraides atcelšana"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Sūtīt ETWS, pārbaudes apraide"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Nosūtīt CMAS prezidenta brīdinājumu"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Nosūtīt CMAS ārkārtas situācijas brīdinājumu"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Nosūtīt CMAS nopietnas situācijas brīdinājumu"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Nosūtīt CMAS Amber brīdinājumu"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Nosūtīt CMAS ikmēneša testa brīdinājumu"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Sūtīt GSM 7 bitu formātā, pārbaudes apraide"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Sūtīt UMTS 7 bitu formātā, pārbaudes apraide"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Sūtīt GSM 7 bitu formātā, pilna garuma apraide"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Sūtīt UMTS 7 bitu formātā, pilna garuma apraide"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Sūtīt GSM 7 bitu formātā, vairāklapu apraide"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Sūtīt UMTS 7 bitu formātā, vairāklapu apraide"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Sūtīt GSM 7 bitu formātā, ar valodu"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Nosūtīt GSM 7 bitu formātā, ar valodu pamattekstā"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Sūtīt UMTS 7 bitu formātā, ar valodu"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Sūtīt GSM UCS-2 formātā, pārbaudes apraide"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Sūtīt UMTS UCS-2 formātā, pārbaudes apraide"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Sūtīt UMTS UCS-2 formātā, vairāklapu apraide"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Sūtīt GSM UCS-2 formātā, ar valodu"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Sūtīt UMTS UCS-2 formātā, ar valodu"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Pirms nosūtīšanas aizkavēt 5 sekundes"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Ziņojuma ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorija:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Šūnu apraides testi"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Sūtīt ETWS zemestrīču apraidi"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Sūtīt ETWS cunami apraidi"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Sūtīt ETWS zemestrīču un cunami apraidi"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Sūtīt ETWS citas ārkārtas situācijas apraidi"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Sūtīt ziņojumu par ETWS brīdinājuma atcelšanu"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Sūtīt ETWS testa ziņojumu"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Sūtīt CMAS prezidenta brīdinājumu"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Sūtīt CMAS ārkārtas situācijas brīdinājumu"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Sūtīt CMAS nopietnas situācijas brīdinājumu"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Sūtīt CMAS AMBER brīdinājumu"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Sūtīt CMAS ikmēneša testa brīdinājumu"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Sūtīt GSM testa ziņojumu 7 bitu formātā"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Sūtīt UMTS testa ziņojumu 7 bitu formātā"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Sūtīt GSM pilna garuma ziņojumu 7 bitu formātā"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Sūtīt UMTS pilna garuma ziņojumu 7 bitu formātā"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Sūtīt GSM vairāklapu ziņojumu 7 bitu formātā"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Sūtīt UMTS vairāklapu ziņojumu 7 bitu formātā"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Sūtīt GSM ziņojumu ar valodu 7 bitu formātā"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Sūtīt GSM ziņojumu ar valodu pamattekstā 7 bitu formātā"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Sūtīt UMTS ziņojumu ar valodu 7 bitu formātā"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Sūtīt GSM testa ziņojumu UCS-2 formātā"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Sūtīt UMTS testa ziņojumu UCS-2 formātā"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Sūtīt UMTS vairāklapu ziņojumu UCS-2 formātā"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Sūtīt GSM ziņojumu ar valodu UCS-2 formātā"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Sūtīt UMTS ziņojumu ar valodu UCS-2 formātā"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Pirms sūtīšanas aizkavēt 5 sekundes"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Ziņojuma ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorija:"</string>
 </resources>
diff --git a/tests/testapp/res/values-mk-rMK/strings.xml b/tests/testapp/res/values-mk-rMK/strings.xml
deleted file mode 100644
index e02e1d8..0000000
--- a/tests/testapp/res/values-mk-rMK/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Тестови на емитување од мобилен"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Испрати нормално емитување за ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Испрати откажување на ETWS-емитувањето"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Испрати тест емитување за ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Испрати CMAS-претседателско предупредување"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Испрати CMAS-предупредување од највисок степен"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Испрати CMAS-сериозно предупредување"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Испрати CMAS AMBER-предупредување"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Испрати CMAS-предупредување за месечно тестирање"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Испрати GSM 7 битно тест емитување"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Испрати UMTS 7 битно тест емитување"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Испрати GSM 7 битно емитување во полна должина"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Испрати UMTS 7 битно емитување во полна должина"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Испрати GSM 7 битно емитување со повеќе страници"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Испрати UMTS 7 битно емитување со повеќе страници"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Испрати GSM 7 битно со јазик"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Испрати GSM 7 битно со јазик во главен текст"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Испрати UMTS 7 битно со јазик"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Испрати GSM UCS-2 тест емитување"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Испрати UMTS UCS-2 тест емитување"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Испрати UMTS UCS-2 емитување со повеќе страници"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Испрати GSM UCS-2 со јазик"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Испрати UMTS UCS-2 со јазик"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Одложи 5 секунди пред испраќање"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ИД на порака:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Категорија:"</string>
-</resources>
diff --git a/tests/testapp/res/values-mk/strings.xml b/tests/testapp/res/values-mk/strings.xml
new file mode 100644
index 0000000..af50a17
--- /dev/null
+++ b/tests/testapp/res/values-mk/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Тестирање мобилен пренос"</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>
+    <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_extreme_alert" msgid="5922644977169679386">"Испратете предупредување од највисок степен преку CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Испратете сериозно предупредување преку CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Испратете AMBER-предупредување преку CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Испратете предупредување за месечно тестирање преку CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Испратете 7-битно тест емитување преку GSM"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Испратете 7-битно тест емитување преку UMTS"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Испратете 7-битно целосно емитување преку GSM"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Испратете 7-битно целосно емитување преку UMTS"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Испратете 7-битно емитување на повеќе страници преку GSM"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Испратете 7-битно емитување на повеќе страници преку UMTS"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Испратете 7-битен GSM со јазик"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Испратете 7-битен GSM со јазик во главен текст"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Испратете 7-битен UMTS со јазик"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Испратете UCS-2 тест емитување преку GSM"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Испратете UCS-2 тест емитување преку UMTS"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Испратете UCS-2 емитување на повеќе страници преку UMTS"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Испратете UCS-2 со јазик преку GSM"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Испратете UCS-2 со јазик преку UMTS"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Одложете 5 секунди пред испраќање"</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-ml-rIN/strings.xml b/tests/testapp/res/values-ml-rIN/strings.xml
deleted file mode 100644
index be2fd17..0000000
--- a/tests/testapp/res/values-ml-rIN/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"സെൽ പ്രക്ഷേപണ പരീക്ഷണങ്ങൾ"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS സാധാരണ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS റദ്ദാക്കൽ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS പരീക്ഷണ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS പ്രസിഡൻഷ്യൽ അലേർട്ട് അയയ്ക്കുക"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS അത്യന്തം ഗുരുതരമായ അലേർട്ട് അയയ്ക്കുക"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS ഗുരുതമായ അലേർട്ട് അയയ്ക്കുക"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS ആമ്പർ അലേർട്ട് അയയ്ക്കുക"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS മാസംതോറുമുള്ള പരീക്ഷണ അലേർട്ട് അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 ബിറ്റ് പരീക്ഷണ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 ബിറ്റ് പരീക്ഷണ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 ബിറ്റ് പൂർണ്ണ ദൈർഘ്യ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS ബിറ്റ് പൂർണ്ണ ദൈർഘ്യ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 ബിറ്റ് മൾട്ടി പേജ് പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 ബിറ്റ് മൾട്ടി പേജ് പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"ഭാഷയോടുകൂടിയ GSM 7 ബിറ്റ് അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"ബോഡിയിലെ ഭാഷയോടുകൂടിയ GSM 7 ബിറ്റ് അയയ്ക്കുക"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"ഭാഷയോടുകൂടിയ UMTS 7 ബിറ്റ് അയയ്ക്കുക"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 പരീക്ഷണ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 പരീക്ഷണ പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 മൾട്ടി പേജ് പ്രക്ഷേപണം അയയ്ക്കുക"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"ഭാഷയോടുകൂടിയ GSM UCS-2 അയയ്ക്കുക"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"ഭാഷയോടുകൂടിയ UMTS UCS-2"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"അയയ്ക്കുന്നതിന് മുമ്പായി 5 സെക്കൻഡ് കാലതാമസം വരുത്തുക"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"സന്ദേശ ഐഡി:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"വിഭാഗം:"</string>
-</resources>
diff --git a/tests/testapp/res/values-ml/strings.xml b/tests/testapp/res/values-ml/strings.xml
new file mode 100644
index 0000000..76d23fa
--- /dev/null
+++ b/tests/testapp/res/values-ml/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"സെൽ ബ്രോഡ്‌കാസ്റ്റ് ടെസ്റ്റുകൾ"</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>
+    <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_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>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS മന്ത്‌ലി ടെസ്റ്റ് അലേർട്ട് അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 ബിറ്റ് ടെസ്റ്റ് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 ബിറ്റ് ടെസ്റ്റ് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 ബിറ്റ് ഫുൾ ലെംഗ്‌ത്ത് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS ബിറ്റ് ഫുൾ ലെംഗ്‌ത്ത് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 ബിറ്റ് മൾട്ടി പേജ് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 ബിറ്റ് മൾട്ടി പേജ് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7 ബിറ്റ് വിത്ത് ലാംഗ്വേജ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"GSM 7 ബിറ്റ് വിത്ത് ലാംഗ്വേജ് ഇൻ ബോഡി അയയ്ക്കുക"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7 ബിറ്റ് വിത്ത് ലാംഗ്വേജ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 ടെസ്റ്റ് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 ടെസ്റ്റ് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 മൾട്ടി പേജ് ബ്രോഡ്‌കാസ്റ്റ് അയയ്ക്കുക"</string>
+    <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">"അയയ്ക്കുന്നതിന് മുമ്പ് 5 സെക്കൻഡ് വൈകിപ്പിക്കുക"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"സന്ദേശ ഐഡി:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"വിഭാഗം:"</string>
+</resources>
diff --git a/tests/testapp/res/values-mn-rMN/strings.xml b/tests/testapp/res/values-mn-rMN/strings.xml
deleted file mode 100644
index de902fa..0000000
--- a/tests/testapp/res/values-mn-rMN/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Үүрэн Нэвтрүүлгийн Тест"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS Энгийн Нэвтрүүлгийг илгээх"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS Цуцлах Нэвтрүүлгийг илгээх"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS тест нэвтрүүлгийг илгээх"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS Ерөнхийлөгчийн Сэрэмжлүүлгийг илгээх"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS Ноцтой Сэрэмжлүүлэг илгээх"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS Ноцтой Сэрэмжлүүлэг илгээх"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS ХУВАН Сэрэмжлүүлэг илгээх"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS Сар тутмын Тест Сэрэмжлүүлгийг илгээх"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 Бит Тест Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 Бит Тест Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 Бит Бүрэн урттай Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 Бит Бүрэн урттай Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 Бит Олон хуудастай Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 Бит Олон хуудастай Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 Бит Хэлтэйг илгээх"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM 7 Бит Дотроо хэлтэйг илгээх"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 Бит Хэлтэйг илгээх"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 Тест Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 Тест Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 Олон хуудастай Нэвтрүүлгийг илгээх"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 Хэлтэйг илгээх"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 Хэлтэйг илгээх"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Илгээхийн өмнө 5 секунд хүлээх"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Зурвасын ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Ангилал:"</string>
-</resources>
diff --git a/tests/testapp/res/values-mn/strings.xml b/tests/testapp/res/values-mn/strings.xml
new file mode 100644
index 0000000..f5875ed
--- /dev/null
+++ b/tests/testapp/res/values-mn/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Үүрэн Нэвтрүүлгийн туршилт"</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>
+    <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_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 AMBER сэрэмжлүүлэг илгээх"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS Сар тутмын туршилтын сэрэмжлүүлэг илгээх"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 Бит туршилтын нэвтрүүлэг илгээх"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 Бит туршилтын нэвтрүүлэг илгээх"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 Бит бүрэн урттай нэвтрүүлэг илгээх"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 Бит Бүрэн урттай Нэвтрүүлэг илгээх"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 Бит олон хуудастай нэвтрүүлэг илгээх"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 Бит олон хуудастай нэвтрүүлэг илгээх"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7 Бит хэлтэйг илгээх"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"GSM 7 Бит бие дотроо хэлтэйг илгээх"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7 Бит хэлтэйг илгээх"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 Туршилтын нэвтрүүлэг илгээх"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 Туршилтын нэвтрүүлэг илгээх"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 Олон хуудастай нэвтрүүлэг илгээх"</string>
+    <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">"Илгээхийн өмнө 5 секунд хүлээх"</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-mr-rIN/strings.xml b/tests/testapp/res/values-mr-rIN/strings.xml
deleted file mode 100644
index b9f2e15..0000000
--- a/tests/testapp/res/values-mr-rIN/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"सेल प्रसारण चाचण्या"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS सामान्य प्रसारण पाठवा"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS रद्द प्रसारण पाठवा"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS चाचणी प्रसारण पाठवा"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS राष्ट्रपतींच्या सूचना पाठवा"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS टोकाची सूचना पाठवा"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS सर्व्हर सूचना पाठवा"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS अँबर सूचना पाठवा"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS मासिक चाचणी सूचना पाठवा"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 बिट चाचणी प्रसारण पाठवा"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 बिट चाचणी प्रसारण पाठवा"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 बिट पूर्ण लांबीचे प्रसारण पाठवा"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 बिट पूर्ण लांबीचे प्रसारण पाठवा"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 बिट एकाधिक पृष्ठ प्रसारण पाठवा"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 बिट एकाधिक पृष्ठ प्रसारण पाठवा"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"भाषेसह GSM 7 बिट पाठवा"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"मुख्य संदेशामध्ये भाषेसह GSM 7 बिट पाठवा"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"भाषेसह UMTS 7 बिट पाठवा"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 चाचणी प्रसारण पाठवा"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 चाचणी प्रसारण पाठवा"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 एकाधिक पृष्ठ प्रसारण पाठवा"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"भाषेसह GSM UCS-2 पाठवा"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"भाषेसह UMTS UCS-2 पाठवा"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"पाठविण्यापूर्वी 5 सेकंद विलंब करा"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"संदेश ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"श्रेणी:"</string>
-</resources>
diff --git a/tests/testapp/res/values-mr/strings.xml b/tests/testapp/res/values-mr/strings.xml
new file mode 100644
index 0000000..b597658
--- /dev/null
+++ b/tests/testapp/res/values-mr/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"सेल प्रसारण चाचण्या"</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>
+    <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_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>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS मासिक चाचणी सूचना पाठवा"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 बिट चाचणी प्रसारण पाठवा"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 बिट चाचणी प्रसारण पाठवा"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 बिट पूर्ण लांबीचे प्रसारण पाठवा"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 बिट पूर्ण लांबीचे प्रसारण पाठवा"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 बिट एकाधिक पृष्ठ प्रसारण पाठवा"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 बिट एकाधिक पृष्ठ प्रसारण पाठवा"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"भाषेसह GSM 7 बिट पाठवा"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"मुख्य संदेशामध्ये भाषेसह GSM 7 बिट पाठवा"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"भाषेसह UMTS 7 बिट पाठवा"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 चाचणी प्रसारण पाठवा"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 चाचणी प्रसारण पाठवा"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 एकाधिक पृष्ठ प्रसारण पाठवा"</string>
+    <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">"पाठविण्यापूर्वी 5 सेकंद विलंब करा"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"संदेश आयडी:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"श्रेणी:"</string>
+</resources>
diff --git a/tests/testapp/res/values-ms-rMY/strings.xml b/tests/testapp/res/values-ms-rMY/strings.xml
deleted file mode 100644
index e079f80..0000000
--- a/tests/testapp/res/values-ms-rMY/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Ujian Siaran Sel"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Hantar Siaran Normal ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Hantar Siaran Batal ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Hantar Siaran Ujian ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Hantar Isyarat Presiden CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Hantar Amaran CMAS Melampau"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Hantar Amaran CMAS Teruk"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Hantar Amaran CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Hantar Amaran Ujian Bulanan CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Hantar Siaran Ujian GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Hantar Siaran Ujian UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Hantar Siaran Penuh GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Hantar Siaran Penuh UTMS 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Hantar Siaran Berbilang Halaman GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Hantar Siaran Berbilang Halaman UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Hantar GSM 7 Bit Dengan Bahasa"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Hantar GSM 7 Bit Dengan Bahasa Dalam Isi"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Hantar UMTS 7 Bit Dengan Bahasa"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Hantar Siaran Ujian GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Hantar Siaran Ujian UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Hantar Siaran Berbilang Halaman UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Hantar GSM UCS-2 Dengan Bahasa"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Hantar UMTS UCS-2 Dengan Bahasa"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Lengah 5 saat sebelum menghantar"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID Mesej:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategori:"</string>
-</resources>
diff --git a/tests/testapp/res/values-ms/strings.xml b/tests/testapp/res/values-ms/strings.xml
new file mode 100644
index 0000000..54b187f
--- /dev/null
+++ b/tests/testapp/res/values-ms/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Ujian Siaran Sel"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Hantar Siaran Gempa Bumi ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Hantar Siaran Tsunami ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Hantar Siaran Gempa Bumi dan Tsunami ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Hantar Siaran Kecemasan ETWS Lain"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Hantar Siaran Batal ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Hantar Siaran Ujian ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Hantar Isyarat Presiden CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Hantar Isyarat Ekstrem CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Hantar Isyarat Teruk CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Hantar Isyarat AMBER CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Hantar Isyarat Ujian Bulanan CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Hantar Siaran Ujian 7 Bit GSM"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Hantar Siaran Ujian 7 Bit UMTS"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Hantar Siaran Penuh 7 Bit GSM"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Hantar Siaran Penuh 7 Bit UTMS"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Hantar Siaran Berbilang Halaman 7 Bit GSM"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Hantar Siaran Berbilang Halaman 7 Bit UMTS"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Hantar 7 Bit GSM Dengan Bahasa"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Hantar 7 Bit GSM Dengan Bahasa Dalam Kandungan"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Hantar 7 Bit UMTS Dengan Bahasa"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Hantar Siaran Ujian UCS-2 GSM"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Hantar Siaran Ujian UCS-2 UMTS"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Hantar Siaran Berbilang Halaman UCS-2 UMTS"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Hantar UCS-2 GSM Dengan Bahasa"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Hantar UCS-2 UMTS Dengan Bahasa"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Lengah 5 saat sebelum menghantar"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID Mesej:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategori:"</string>
+</resources>
diff --git a/tests/testapp/res/values-my-rMM/strings.xml b/tests/testapp/res/values-my-rMM/strings.xml
deleted file mode 100644
index 5ddc143..0000000
--- a/tests/testapp/res/values-my-rMM/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"ဆဲလ် ထုတ်လွှင့်မှု စမ်းသပ်မှုများ"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS ပုံမှန် ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS ပယ်ဖျက်ရေး ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS စမ်းသပ်ရေး ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS သမ္မတအဆင့် သတိပေးချက် ပို့"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS ပြင်းထန်သည့် သတိပေးချက် ပို့"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS လွန်ကဲပြင်းထန်မှု သတိပေးချက် ပို့"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER သတိပေးချက် ပို့"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS လစဉ် စမ်းသပ်မှု သတိပေးချက် ပို့"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 Bit စမ်းသပ်ရေး ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 စမ်းသပ်ရေး ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 Bit ထုတ်လွှင့်မှု အပြည့် ပို့"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 Bit ထုတ်လွှင့်မှု အပြည့် ပို့"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 Bit စာမျက်နှာ များစွာပါ ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7  Bit စာမျက်နှာ များစွာပါ ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 Bit ဘာသာစကားနှင့် အတူ ပို့"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM 7 Bit စာသားထဲပါ ဘာသာစကားနှင့် အတူ ပို့"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 Bit ဘာသာစကားနှင့် အတူ ပို့"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 စမ်းသပ်ရေး ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 စမ်းသပ်ရေး ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 စာမျက်နှာ များစွာပါ ထုတ်လွှင့်မှု ပို့"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 ဘာသာစကားနှင့် အတူ ပို့"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"SUMTS UCS-2 ဘာသာစကားနှင့် အတူ ပို့"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"မပို့မီ ၅ စက္ကန့် စောင့်ပါ"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"စာတို ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"အမျိုးအစား:"</string>
-</resources>
diff --git a/tests/testapp/res/values-my/strings.xml b/tests/testapp/res/values-my/strings.xml
new file mode 100644
index 0000000..b602419
--- /dev/null
+++ b/tests/testapp/res/values-my/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"ဆဲလ်လူလာထုတ်လွှင့်မှု စမ်းသပ်ချက်များ"</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>
+    <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_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>
+    <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>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 Bit အစအဆုံးထုတ်လွှင့်မှုကို ပို့ပါ"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 Bit စာမျက်နှာများစွာထုတ်လွှင့်ခြင်းကို ပို့ပါ"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 Bit စာမျက်နှာများစွာထုတ်လွှင့်ခြင်းကို ပို့ပါ"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7 Bit ကို စာသားဖြင့် ပို့ပါ"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"GSM 7 Bit ကို စာသားဖြင့် ပို့ပါ"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7 Bit ကို စာသားဖြင့် ပို့ပါ"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 စမ်းသပ်ထုတ်လွှင့်ခြင်းကို ပို့ပါ"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 စမ်းသပ်ထုတ်လွှင့်ခြင်းကို ပို့ပါ"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 စာမျက်နှာများစွာ ထုတ်လွှင့်ခြင်းကို ပို့ပါ"</string>
+    <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">"မက်ဆေ့ဂျ်အိုင်ဒီ −"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"အမျိုးအစား −"</string>
+</resources>
diff --git a/tests/testapp/res/values-nb/strings.xml b/tests/testapp/res/values-nb/strings.xml
index dd4178f..5c31e77 100644
--- a/tests/testapp/res/values-nb/strings.xml
+++ b/tests/testapp/res/values-nb/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Cellekringkastingstester"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Send vanlig ETWS-kringkasting"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Send tilbakekalling av kringkasting for ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Send testkringkasting for ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Send presidentvarsel via CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Send ekstremvarsel via CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Send alvorlig varsel via CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Send et varsel for barnebortføring via CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Send månedlig testvarsel via CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Send testkringkasting for 7-biters GSM"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Send testkringkasting for 7-biters UMTS"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Send fullengdes kringkasting for 7-biters GSM"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Send fullengdes kringkasting for 7-biters UMTS"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Send flersideskringkasting for 7-biters GMS"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Send flersideskringkasting for 7-biters UMTS"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Send 7-biters GSM med språk"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Send 7-bits GSM med språket i teksten"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Send 7-biters UMTS med språk"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Send testkringkasting for GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Send testkringkasting for UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Send flersideskringkasting for UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Send GSM UCS-2 med språk"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Send UMTS UCS-2 med språk"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Send etter en fem sekunders forsinkelse"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Meldings-ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategori:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Tester av kringkastede meldinger"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Send ETWS-kringkasting om jordskjelv"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Send ETWS-kringkasting om tsunami"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Send ETWS-kringkasting om jordskjelv og tsunami"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Send ETWS-kringkasting om annen nødssituasjon"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Send tilbakekalling av kringkasting for ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Send testkringkasting for ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Send presidentvarsel via CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Send ekstremvarsel via CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Send alvorlig varsel via CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Send et varsel for barnebortføring via CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Send månedlig testvarsel via CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Send testkringkasting for 7-biters GSM"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Send testkringkasting for 7-biters UMTS"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Send fullengdes kringkasting for 7-biters GSM"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Send fullengdes kringkasting for 7-biters UMTS"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Send flersideskringkasting for 7-biters GMS"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Send flersideskringkasting for 7-biters UMTS"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Send 7-biters GSM med språk"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Send 7-bits GSM med språket i teksten"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Send 7-biters UMTS med språk"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Send testkringkasting for GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Send testkringkasting for UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Send flersideskringkasting for UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Send GSM UCS-2 med språk"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Send UMTS UCS-2 med språk"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Send etter en fem sekunders forsinkelse"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Meldings-ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategori:"</string>
 </resources>
diff --git a/tests/testapp/res/values-ne-rNP/strings.xml b/tests/testapp/res/values-ne-rNP/strings.xml
deleted file mode 100644
index b279bb0..0000000
--- a/tests/testapp/res/values-ne-rNP/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"सेल प्रसारण परीक्षणहरू"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS सामान्य प्रसारण पठाउनुहोस्"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS रद्द प्रसारण पठाउनुहोस्"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS परीक्षण प्रसारण पठाउनुहोस्"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS राष्ट्रपतिय सावधानी पठाउनुहोस्"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS चरम सावधानी पठाउनुहोस्"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS गम्भीर चेतावनी पठाउनुहोस्"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER सावधानी पठाउनुहोस्"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS मासिक परीक्षण सावधानी पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM ७ बिट परीक्षण प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS ७ बिट परीक्षण प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM ७ बिट पूर्ण लम्बाइको प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS ७ बिट पूर्ण लम्बाइको प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM ७ बिट बहुपृष्ठ प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS ७ बिट बहुपृष्ठ प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM ७ बिट भाषाको साथ पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"शरीरमा भाषाको साथ GSM ७ बिट पठाउनुहोस्"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS ७ बिट भाषाको साथ पठाउनुहोस्"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-२ परीक्षण प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-२ परीक्षण प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-२ बहुपृष्ठ प्रसारण पठाउनुहोस्"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"भाषाको साथ GSM UCS-२ पठाउनुहोस्"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"भाषाको साथ UMTS UCS-२ पठाउनुहोस"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"पठाउनु अघि ५ सेकेन्ड ढिलो गर्नुहोस्"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"सन्देश ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"कोटी:"</string>
-</resources>
diff --git a/tests/testapp/res/values-ne/strings.xml b/tests/testapp/res/values-ne/strings.xml
new file mode 100644
index 0000000..8404b84
--- /dev/null
+++ b/tests/testapp/res/values-ne/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"मोबाइल प्रसारणका परीक्षणहरू"</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>
+    <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_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 AMBER सम्बन्धी सतर्कता पठाउनुहोस्"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS को मासिक परीक्षण सम्बन्धी सतर्कता पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM ७ बिटको परीक्षण सम्बन्धी प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS ७ बिटको परीक्षण सम्बन्धी प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM ७ बिटको पूर्ण लम्बाइको प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS ७ बिटको पूर्ण लम्बाइको प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM ७ बिटको बहुपृष्ठ सम्बन्धी प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS ७ बिटको बहुपृष्ठ सम्बन्धी प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"भाषा सहितको GSM ७ बिट पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"मुख्य भागमा भाषा राखेर GSM ७ बिट पठाउनुहोस्"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"भाषा सहितको UMTS ७ बिट पठाउनुहोस्"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-२ को परीक्षण सम्बन्धी प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-२ को परीक्षण सम्बन्धी प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-२ सम्बन्धी बहुपृष्ठको प्रसारण पठाउनुहोस्"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"भाषा सहितको GSM UCS-२ पठाउनुहोस्"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"भाषा सहितको UMTS UCS-२ पठाउनुहोस्"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"पठाउनु अघि ५ सेकेन्ड ढिलो गर्नुहोस्"</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-nl/strings.xml b/tests/testapp/res/values-nl/strings.xml
index a3c046c..811a30f 100644
--- a/tests/testapp/res/values-nl/strings.xml
+++ b/tests/testapp/res/values-nl/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Cell broadcast-tests"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Normaal ETWS-bericht verzenden"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS annuleringsbericht sturen"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS-testbericht verzenden"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Nationale CMAS-waarschuwing verzenden"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Extreme waarschuwing voor CMAS verzenden"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Ernstige waarschuwing voor CMAS verzenden"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"AMBER-alert voor CMAS verzenden"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Maandelijkse testwaarschuwing voor CMAS verzenden"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7-bits testbericht verzenden"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7-bits testbericht verzenden"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7-bits bericht van volledige lengte verzenden"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7-bits bericht van volledige lengte sturen"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7-bits bericht van meerdere pagina\'s sturen"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7-bits bericht van meerdere pagina\'s sturen"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7-bits met taal sturen"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"GSM 7-bits met taal verzenden"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7-bits met taal verzenden"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 testbericht verzenden"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 testbericht verzenden"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 bericht van meerdere pagina\'s sturen"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 met taal sturen"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 met taal sturen"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Vertraging van vijf seconden voor verzending"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Bericht-ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categorie:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Cell broadcast-tests"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"ETWS-waarschuwing voor aardbeving verzenden"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"ETWS-waarschuwing voor tsunami verzenden"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"ETWS-waarschuwing voor aardbeving en tsunami verzenden"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"ETWS-waarschuwing voor andere noodsituatie verzenden"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"ETWS-annuleringsbericht verzenden"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"ETWS-testbericht verzenden"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Nationale CMAS-waarschuwing verzenden"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Extreme waarschuwing voor CMAS verzenden"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Ernstige waarschuwing voor CMAS verzenden"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"AMBER-alert voor CMAS verzenden"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Maandelijkse testwaarschuwing voor CMAS verzenden"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7-bits testbericht verzenden"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7-bits testbericht verzenden"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7-bits bericht van volledige lengte verzenden"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7-bits bericht van volledige lengte sturen"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7-bits bericht van meerdere pagina\'s sturen"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7-bits bericht van meerdere pagina\'s sturen"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7-bits met taal sturen"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"GSM 7-bits met taal verzenden"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7-bits met taal verzenden"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 testbericht verzenden"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 testbericht verzenden"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 bericht van meerdere pagina\'s sturen"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"GSM UCS-2 met taal sturen"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"UMTS UCS-2 met taal sturen"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Vertraging van vijf seconden voor verzending"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Bericht-ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categorie:"</string>
 </resources>
diff --git a/tests/testapp/res/values-pa-rIN/strings.xml b/tests/testapp/res/values-pa-rIN/strings.xml
deleted file mode 100644
index 97b2913..0000000
--- a/tests/testapp/res/values-pa-rIN/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"ਸੈਲ ਪ੍ਰਸਾਰਨ ਜਾਂਚਾਂ"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS ਸਧਾਰਨ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS ਰੱਦ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS ਪ੍ਰੈਜੀਡੈਂਸ਼ੀਅਲ ਚਿਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS ਐਕਸਟ੍ਰੀਮ ਚਿਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS ਗੰਭੀਰ ਚਿਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER ਚਿਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS ਮਾਸਿਕ ਜਾਂਚ ਚਿਤਾਵਨੀ ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 Bit ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 Bit ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 Bit ਪੂਰੀ ਲੰਮਾਈ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 Bit ਪੂਰੀ ਲੰਮਾਈ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 Bit ਮਲਟੀ ਸਫ਼ਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 Bit ਮਲਟੀ ਸਫ਼ਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"ਭਾਸ਼ਾ ਨਾਲ GSM 7 Bit ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"ਬੌਡੀ ਵਿੱਚ ਭਾਸ਼ਾ ਨਾਲ GSM 7 Bit ਭੇਜੋ"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"ਭਾਸ਼ਾ ਨਾਲ UMTS 7 Bit ਭੇਜੋ"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 ਮਲਟੀ ਸਫ਼ਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"ਭਾਸ਼ਾ ਨਾਲ GSM UCS-2 ਭੇਜੋ"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"ਭਾਸ਼ਾ ਨਾਲ UMTS UCS-2 ਭੇਜੋ"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ 4 ਸਕਿੰਟ ਤੱਕ ਸਥਗਿਤ ਕਰੋ"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ਸੁਨੇਹਾ ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"ਸ਼੍ਰੇਣੀ:"</string>
-</resources>
diff --git a/tests/testapp/res/values-pa/strings.xml b/tests/testapp/res/values-pa/strings.xml
new file mode 100644
index 0000000..3fc8cd1
--- /dev/null
+++ b/tests/testapp/res/values-pa/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"ਸੈਲ ਪ੍ਰਸਾਰਨ ਜਾਂਚਾਂ"</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>
+    <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_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>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 Bit ਪੂਰੀ ਸਮਾਂ ਅਵਧੀ ਦਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 Bit ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਪੰਨੇ ਦਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 Bit ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਪੰਨੇ ਦਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"ਭਾਸ਼ਾ ਨਾਲ GSM 7 Bit ਭੇਜੋ"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"ਮੁੱਖ ਭਾਗ ਵਿੱਚ ਭਾਸ਼ਾ ਨਾਲ GSM 7 Bit ਭੇਜੋ"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"ਭਾਸ਼ਾ ਨਾਲ UMTS 7 Bit ਭੇਜੋ"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 ਜਾਂਚ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 ਇੱਕ ਤੋਂ ਵਧੇਰੇ ਪੰਨੇ ਦਾ ਪ੍ਰਸਾਰਨ ਭੇਜੋ"</string>
+    <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">"ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ 5 ਸਕਿੰਟ ਲਈ ਸਥਗਿਤ ਕਰੋ"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ਸੁਨੇਹਾ ਆਈ.ਡੀ.:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"ਸ਼੍ਰੇਣੀ:"</string>
+</resources>
diff --git a/tests/testapp/res/values-pl/strings.xml b/tests/testapp/res/values-pl/strings.xml
index f398cb9..a6515e6 100644
--- a/tests/testapp/res/values-pl/strings.xml
+++ b/tests/testapp/res/values-pl/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Testy komunikataów z sieci komórkowej"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Wyślij normalną transmisję w systemie ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Wyślij transmisję ETWS anulowania"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Wyślij transmisję testową ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Wyślij alert prezydencki w systemie CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Wyślij ekstremalny alert w systemie CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Wyślij poważny alert w systemie CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Wyślij alert AMBER w systemie CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Wyślij comiesięczny alert testowy w systemie CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Wyślij transmisję testową GSM 7-bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Wyślij transmisję testową UMTS 7-bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Wyślij pełnej długości transmisję GSM 7-bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Wyślij pełnej długości transmisję UMTS 7-bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Wyślij transmisję GSM 7-bit Multi Page"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Wyślij transmisję UMTS 7-bit Multi Page"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Wyślij transmisję GSM 7-bit z kodem języka"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Wyślij transmisję GSM 7-bit z kodem języka w treści"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Wyślij UMTS 7-bit z kodem języka"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Wyślij transmisję testową GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Wyślij transmisję testową UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Wyślij transmisję UMTS UCS-2 Multi Page"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Wyślij w kodowaniu GSM UCS-2 z kodem języka"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Wyślij UMTS UCS-2 z kodem języka"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Opóźnienie 5 sekund przed wysłaniem"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Identyfikator wiadomości:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategoria:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Testy komunikatów z sieci komórkowej"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Wyślij wiadomość ostrzegającą przed trzęsieniem ziemi w systemie ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Wyślij wiadomość ostrzegającą przed tsunami w systemie ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Wyślij wiadomość ostrzegającą przed trzęsieniem ziemi i tsunami w systemie ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Wyślij inną wiadomość alarmową w systemie ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Wyślij transmisję ETWS anulowania"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Wyślij testową transmisję w systemie ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Wyślij alert prezydencki w systemie CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Wyślij ekstremalny alert w systemie CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Wyślij poważny alert w systemie CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Wyślij alert AMBER w systemie CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Wyślij comiesięczny alert testowy w systemie CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Wyślij transmisję testową GSM 7-bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Wyślij transmisję testową UMTS 7-bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Wyślij pełnej długości transmisję GSM 7-bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Wyślij pełnej długości transmisję UMTS 7-bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Wyślij transmisję GSM 7-bit Multi Page"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Wyślij transmisję UMTS 7-bit Multi Page"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Wyślij transmisję GSM 7-bit z kodem języka"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Wyślij transmisję GSM 7-bit z kodem języka w treści"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Wyślij UMTS 7-bit z kodem języka"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Wyślij transmisję testową GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Wyślij transmisję testową UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Wyślij transmisję UMTS UCS-2 Multi Page"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Wyślij w GSM UCS-2 z kodem języka"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Wyślij w UMTS UCS-2 z kodem języka"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Opóźnienie 5 sekund przed wysłaniem"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Identyfikator wiadomości:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategoria:"</string>
 </resources>
diff --git a/tests/testapp/res/values-pt-rPT/strings.xml b/tests/testapp/res/values-pt-rPT/strings.xml
index 16b999e..048061f 100644
--- a/tests/testapp/res/values-pt-rPT/strings.xml
+++ b/tests/testapp/res/values-pt-rPT/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Testes de Transmissão Celular"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Enviar Transmissão Normal ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Enviar Difusão de Cancelamento ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Enviar Difusão de Teste ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Enviar Alerta Presidencial do CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Enviar Alerta Extremo do CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Enviar Alerta Grave do CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Enviar Alerta AMBER do CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Enviar Alerta de Teste Mensal do CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Enviar Difusão de Teste GSM de 7 Bits"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Enviar Difusão de Teste UMTS de 7 Bits"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Enviar Difusão de Duração Completa GSM de 7 Bits"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Enviar Difusão de Duração Completa UMTS de 7 Bits"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Enviar Difusão de Várias Páginas GSM de 7 Bits"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Enviar Difusão de Várias Páginas UMTS de 7 Bits"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Enviar GSM de 7 Bits com Linguagem"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Enviar mensagem GSM de 7 Bits Com Linguagem No Corpo"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Enviar UMTS de 7 Bits com Linguagem"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Enviar Difusão de Teste UCS-2 GSM"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Enviar Difusão de Teste UCS-2 UMTS"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Enviar Difusão de Várias Páginas UCS-2 UMTS"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Enviar GSM UCS-2 Com Idioma"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Enviar UCS-2 UMTS com Linguagem"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Atrasar 5 segundos antes de enviar"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID da Mensagem:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categoria:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Testes de difusão celular"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Enviar difusão sobre terramoto do ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Enviar difusão sobre tsunami do ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Enviar difusão sobre terramoto e tsunami do ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Enviar difusão de outra emergência do ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Enviar difusão de cancelamento do ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Enviar difusão de teste do ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Enviar alerta presidencial do CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Enviar alerta extremo do CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Enviar alerta grave do CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Enviar alerta AMBER do CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Enviar alerta de teste mensal do CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Enviar difusão de teste GSM de 7 bits"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Enviar difusão de teste UMTS de 7 bits"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Enviar difusão de duração completa GSM de 7 bits"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Enviar difusão de duração completa UMTS de 7 bits"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Enviar difusão de várias páginas GSM de 7 bits"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Enviar difusão de várias páginas UMTS de 7 bits"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Enviar GSM de 7 bits com linguagem"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Enviar GSM de 7 bits com linguagem no corpo"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Enviar UMTS de 7 bits com linguagem"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Enviar difusão de teste UCS-2 GSM"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Enviar difusão de teste UCS-2 UMTS"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Enviar difusão de várias páginas UCS-2 UMTS"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Enviar GSM UCS-2 com linguagem"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Enviar UCS-2 UMTS com linguagem"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Atrasar 5 segundos antes de enviar"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID da mensagem:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categoria:"</string>
 </resources>
diff --git a/tests/testapp/res/values-pt/strings.xml b/tests/testapp/res/values-pt/strings.xml
index 5db0a51..9baa5b3 100644
--- a/tests/testapp/res/values-pt/strings.xml
+++ b/tests/testapp/res/values-pt/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Testes de transmissão por celular"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Enviar transmissão normal do ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Enviar transmissão de cancelamento ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Enviar transmissão de teste ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Enviar Alerta presidencial CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Enviar Alerta extremo CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Enviar Alerta grave CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Enviar Alerta CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Enviar Alerta de teste mensal CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Enviar transmissão de teste GSM 7 bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Enviar transmissão de teste UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Enviar transmissão completa GSM 7 bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Enviar transmissão completa UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Enviar transmissão de várias páginas GSM 7 bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Enviar transmissão de várias páginas UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Enviar GSM 7 bit com idioma"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Enviar GSM 7 bit com idioma"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Enviar UMTS 7 bit com idioma"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Enviar transmissão de teste GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Enviar transmissão de teste UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Enviar transmissão de várias páginas UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Enviar GSM UCS-2 com idioma"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Enviar UMTS UCS-2 com idioma"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Demorar cinco segundos antes de enviar"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID da mensagem:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categoria:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Testes de transmissão por celular"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Enviar transmissão de terremoto do ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Enviar transmissão de tsunami do ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Enviar transmissão de terremotos e tsunamis do Sistema de avisos de terremotos e tsunamis (ETWS, na sigla em inglês)"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Enviar transmissão de outra emergência do ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Enviar transmissão de cancelamento ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Enviar transmissão de teste ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Enviar Alerta presidencial CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Enviar Alerta extremo CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Enviar Alerta grave CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Enviar Alerta CMAS AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Enviar Alerta de teste mensal CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Enviar transmissão de teste GSM 7 bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Enviar transmissão de teste UMTS 7 bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Enviar transmissão completa GSM 7 bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Enviar transmissão completa UMTS 7 bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Enviar transmissão de várias páginas GSM 7 bit"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Enviar transmissão de várias páginas UMTS 7 bit"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Enviar GSM 7 bit com idioma"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Enviar GSM 7 bit com idioma"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Enviar UMTS 7 bit com idioma"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Enviar transmissão de teste GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Enviar transmissão de teste UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Enviar transmissão de várias páginas UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Enviar GSM UCS-2 com idioma"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Enviar UMTS UCS-2 com idioma"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Demorar cinco segundos antes de enviar"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID da mensagem:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categoria:"</string>
 </resources>
diff --git a/tests/testapp/res/values-ro/strings.xml b/tests/testapp/res/values-ro/strings.xml
index 551bc11..a72fa17 100644
--- a/tests/testapp/res/values-ro/strings.xml
+++ b/tests/testapp/res/values-ro/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Teste transmisie celulară"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Trimiteți difuzare ETWS normală"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Difuzaţi un mesaj de anulare ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Difuzaţi un mesaj de test ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Trimiteți o alertă prezidențială CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Trimiteți o alertă extremă CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Trimiteți o alertă gravă CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Trimiteți o alertă CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Trimiteți lunar o alertă de test CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Difuzaţi un mesaj de test GSM pe 7 biți"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Difuzaţi un mesaj de test UMTS pe 7 biți"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Difuzaţi un mesaj de dimensiune completă GSM pe 7 biți"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Difuzaţi un mesaj de dimensiune completă UMTS pe 7 biți"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Difuzaţi un mesaj multipagină GSM pe 7 biți"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Difuzaţi un mesaj multipagină UMTS pe 7 biți"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Trimiteți un mesaj GSM pe 7 biți în care să precizați limba"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">" Trimiteți un mesaj în format GSM pe 7 biți cu limba în corpul mesajului"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Trimiteți un mesaj UMTS pe 7 biți în care să precizați limba"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Difuzaţi un mesaj de test GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Difuzaţi un mesaj de test UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Difuzaţi un mesaj multipagină UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Trimiteți mesaj GSM UCS-2 în care să precizați limba"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Trimiteți un mesaj UMTS UCS-2 în care să precizați limba"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Întârziați 5 secunde înaintea trimiterii"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID-ul mesajului:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Categorie:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Teste pentru transmisia celulară"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Difuzați un mesaj ETWS pentru cutremure"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Difuzați un mesaj ETWS pentru tsunami"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Difuzați un mesaj ETWS pentru cutremure și tsunami"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Difuzați un mesaj ETWS pentru alte urgențe"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Difuzați un mesaj de anulare ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Difuzați un mesaj de test ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Trimiteți o alertă prezidențială CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Trimiteți o alertă extremă CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Trimiteți o alertă gravă CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Trimiteți o alertă CMAS AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Trimiteți lunar o alertă de test CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Difuzați un mesaj de test GSM pe 7 biți"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Difuzați un mesaj de test UMTS pe 7 biți"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Difuzați un mesaj de dimensiune completă GSM pe 7 biți"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Difuzați un mesaj de dimensiune completă UMTS pe 7 biți"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Difuzați un mesaj multipagină GSM pe 7 biți"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Difuzați un mesaj multipagină UMTS pe 7 biți"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Trimiteți un mesaj GSM pe 7 biți în care să precizați limba"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Trimiteți un mesaj GSM pe 7 biți cu limba în corpul mesajului"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Trimiteți un mesaj UMTS pe 7 biți în care să precizați limba"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Difuzați un mesaj de test GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Difuzați un mesaj de test UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Difuzați un mesaj multipagină UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Trimiteți un mesaj GSM UCS-2 în care să precizați limba"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Trimiteți un mesaj UMTS UCS-2 în care să precizați limba"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Întârziați 5 secunde înaintea trimiterii"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID-ul mesajului:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Categorie:"</string>
 </resources>
diff --git a/tests/testapp/res/values-ru/strings.xml b/tests/testapp/res/values-ru/strings.xml
index 3c1d34c..59adf09 100644
--- a/tests/testapp/res/values-ru/strings.xml
+++ b/tests/testapp/res/values-ru/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Тестирование широковещательной передачи сообщений"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Отправить обычную трансляцию системы предупреждения о землетрясении и цунами"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Отправить рассылку об отмене оповещения системы предупреждения о землетрясении и цунами"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Отправить тестовую рассылку системы предупреждения о землетрясении и цунами"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Отправить президентское оповещение через CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Отправить оповещение о критической угрозе через CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Отправить оповещение о серьезной угрозе через CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Отправить оповещение AMBER через CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Отправить ежемесячное тестовое оповещение через CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Отправить 7-битную тестовую GSM-рассылку"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Отправить 7-битную тестовую UMTS-рассылку"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Отправить 7-битную GSM-рассылку полной длины"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Отправить 7-битную UMTS-рассылку полной длины"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Отправить 7-битную многостраничную GSM-рассылку"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Отправить 7-битную многостраничную UMTS-рассылку"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Отправить 7-битное GSM-сообщение с языком"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Отправить сообщение GSM 7 Bit с указанием языка в тексте"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Отправить 7-битное UMTS-сообщение с языком"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Отправить тестовую GSM-рассылку UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Отправить тестовую UMTS-рассылку UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Отправить многостраничную UMTS-рассылку UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Отправить GSM-сообщение UCS-2 с языком"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Отправить UMTS-сообщение UCS-2 с языком"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Задержка перед отправкой 5 секунд"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Идентификатор сообщения:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Категория:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Тестирование оповещения населения"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Отправить рассылку о землетрясении"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Отправить рассылку о цунами"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Отправить рассылку системы предупреждения о землетрясениях и цунами"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Отправить другое оповещение системы предупреждения о землетрясениях и цунами"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Отправить рассылку об отмене оповещения системы предупреждения о землетрясениях и цунами"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Отправить тестовую рассылку системы предупреждения о землетрясениях и цунами"</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">"Отправить оповещение AMBER через CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Отправить ежемесячное тестовое оповещение через CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Отправить 7-битную тестовую GSM-рассылку"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Отправить 7-битную тестовую UMTS-рассылку"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Отправить 7-битную GSM-рассылку полной длины"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Отправить 7-битную UMTS-рассылку полной длины"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Отправить 7-битную многостраничную GSM-рассылку"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Отправить 7-битную многостраничную UMTS-рассылку"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Отправить 7-битное GSM-сообщение с указанием языка"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Отправить 7-битное GSM-сообщение с указанием языка в тексте"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Отправить 7-битное UMTS-сообщение с указанием языка"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Отправить тестовую GSM-рассылку UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Отправить тестовую UMTS-рассылку UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Отправить многостраничную UMTS-рассылку UCS-2"</string>
+    <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">"Задержка перед отправкой 5 секунд"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Идентификатор сообщения:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Категория:"</string>
 </resources>
diff --git a/tests/testapp/res/values-si-rLK/strings.xml b/tests/testapp/res/values-si-rLK/strings.xml
deleted file mode 100644
index 40496d4..0000000
--- a/tests/testapp/res/values-si-rLK/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"ජංගම විකාශන පරීක්ෂණ"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS සාමාන්‍ය විකාශනය යවන්න"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS අවලංගු කරන විකාශනය යවන්න"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS පරීක්ෂණ විකාශනය යවන්න"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS සභාපතිගේ ඇඟවීම යවන්න"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS උපරිම ඇඟවීම යවන්න"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS දැඩි ඇඟවීම යවන්න"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER ඇඟවීම යවන්න"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS මාසික පරීක්ෂණ ඇඟවීම යවන්න"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 බිට් පරීක්ෂණ විකාශනය යවන්න"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 බිට් පරීක්ෂණ විකාශනය යවන්න"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GMS 7 බිට් සම්පුර්ණ දිගු විකාශනය යවන්න"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 බිට් සම්පුර්ණ දිගු විකාශනය යවන්න"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 බිට් බහු පිටු විකාශනය යවන්න"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 බිට් බහු පිටු විකාශනය යවන්න"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"භාෂාව සමග GSM 7 බිට් යවන්න"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"කඳ තුළ භාෂාව සමග GSM 7 බිට් යවන්න"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"කඳ තුළ භාෂාව සමග UMTS 7 බිට් යවන්න"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 පරීක්ෂණ විකාශනය යවන්න"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 පරීක්ෂණ විකාශනය යවන්න"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 බහු පිටු විකාශනය යවන්න"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"භාෂාව සමග GSM UCS-2 යවන්න"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"භාෂාව සමග UMTS UCS-2 යවන්න"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"යැවීමට පෙර තත්පර 5 ක් ප්‍රමාද කරන්න"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"පණිවිඩය ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"ප්‍රවර්ගය:"</string>
-</resources>
diff --git a/tests/testapp/res/values-si/strings.xml b/tests/testapp/res/values-si/strings.xml
new file mode 100644
index 0000000..78a362e
--- /dev/null
+++ b/tests/testapp/res/values-si/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"සෙල් විකාශ පරීක්ෂා"</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>
+    <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_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 AMBER ඇඟවීම යවන්න"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS මාසික පරීක්ෂා ඇඟවීම යවන්න"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 බිට් පරීක්ෂා විකාශය යවන්න"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 බිට් පරීක්ෂා විකාශය යවන්න"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GMS 7 බිට් පූර්ණ දිගු විකාශය යවන්න"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 බිට් පූර්ණ දිගු විකාශය යවන්න"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 බිට් බහු පිටු විකාශය යවන්න"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 බිට් බහු පිටු විකාශය යවන්න"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"භාෂාව සමග GSM 7 බිට් යවන්න"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"අන්තර්ගතය තුළ භාෂාව සමග GSM 7 බිට් යවන්න"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"භාෂාව සමග UMTS 7 බිට් යවන්න"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 පරීක්ෂා විකාශය යවන්න"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 පරීක්ෂා විකාශය යවන්න"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 බහු පිටු විකාශය යවන්න"</string>
+    <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">"යැවීමට පෙර තත්පර 5ක් ප්‍රමාද කරන්න"</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-sk/strings.xml b/tests/testapp/res/values-sk/strings.xml
index 5134b7a..7356a71 100644
--- a/tests/testapp/res/values-sk/strings.xml
+++ b/tests/testapp/res/values-sk/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Testy správ Cell Broadcast"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Odoslať normálne vysielanie systému ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Odoslať rušiace vysielanie ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Odoslať testovacie vysielanie ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Odoslať prezidentské upozornenie CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Odoslať extrémne upozornenie CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Odoslať závažné upozornenie CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Odoslať upozornenie AMBER CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Odoslať mesačné testovacie upozornenie CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Odoslať testovacie vysielanie GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Odoslať testovacie vysielanie UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Odoslať vysielanie v celej dĺžke GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Odoslať vysielanie v celej dĺžke UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Odoslať viacstránkové vysielanie GSM 7 Bit"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Odoslať viacstránkové vysielanie UMTS 7 Bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Odoslať GSM 7 Bit s jazykom"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Odoslať GSM 7 bitov s jazykom v tele správy"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Odoslať UMTS 7 Bit s jazykom"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Odoslať testovacie vysielanie GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Odoslať testovacie vysielanie UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Odoslať viacstránkové vysielanie UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Odoslať GSM UCS-2 s jazykom"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Odoslať UMTS UCS-2 s jazykom"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Pred odoslaním oneskoriť o 5 s"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID správy:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategória:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Testy správ Cell Broadcast"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Odoslať vysielanie ETWS o zemetrasení"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Odoslať vysielanie ETWS o tsunami"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Odoslať vysielanie ETWS o zemetrasení a tsunami"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Odoslať iné núdzové vysielanie ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Odoslať rušiace vysielanie ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Odoslať testovacie vysielanie ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Odoslať prezidentské upozornenie CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Odoslať extrémne upozornenie CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Odoslať závažné upozornenie CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Odoslať upozornenie AMBER CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Odoslať mesačné testovacie upozornenie CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Odoslať testovacie vysielanie GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Odoslať testovacie vysielanie UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Odoslať vysielanie v celej dĺžke GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Odoslať vysielanie v celej dĺžke UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Odoslať viacstránkové vysielanie GSM 7 Bit"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Odoslať viacstránkové vysielanie UMTS 7 Bit"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Odoslať GSM 7 Bit s jazykom"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Odoslať GSM 7 Bit s jazykom v texte správy"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Odoslať UMTS 7 Bit s jazykom"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Odoslať testovacie vysielanie GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Odoslať testovacie vysielanie UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Odoslať viacstránkové vysielanie UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Odoslať GSM UCS-2 s jazykom"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Odoslať UMTS UCS-2 s jazykom"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Pred odoslaním oneskoriť o 5 s"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID správy:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategória:"</string>
 </resources>
diff --git a/tests/testapp/res/values-sl/strings.xml b/tests/testapp/res/values-sl/strings.xml
index 5f920d3..44552e6 100644
--- a/tests/testapp/res/values-sl/strings.xml
+++ b/tests/testapp/res/values-sl/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Preskusi oddajanja v celici"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Pošlji navadno oddajo ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Pošlji preklic oddaje ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Pošlji preskusno oddajo ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Pošlji predsedniško opozorilo za CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Pošlji izjemno opozorilo za CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Pošlji hudo opozorilo za CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Pošlji opozorilo AMBER za CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Pošlji mesečno preskusno opozorilo za CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Pošlji 7-bitno preskusno oddajo GSM"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Pošlji 7-bitno preskusno oddajo UMTS"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Pošlji 7-bitno celotno oddajo GSM"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Pošlji 7-bitno celotno oddajo UMTS"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Pošlji 7-bitno večstransko oddajo GSM"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Pošlji 7-bitno večstransko oddajo UMTS"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Pošlji 7-bitno oddajo GSM z jezikom"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Pošlji 7-bitno sporočilo GSM z jezikom v telesu"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Pošlji 7-bitni UMTS z jezikom"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Pošlji preskusno oddajo GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Pošlji preskusno oddajo UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Pošlji večstransko oddajo UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Pošlji GSM UCS-2 z jezikom"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Pošlji UMTS UCS-2 z jezikom"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Pred pošiljanjem počakaj 5 sekund"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID sporočila:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorija:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Preskusi oddajanja v celici"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Pošlji oddajo ETWS o potresu"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Pošlji oddajo ETWS o cunamiju"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Pošlji oddajo ETWS o potresu in cunamiju"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Pošlji oddajo ETWS o drugih opozorilih v sili"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Pošlji preklic oddaje ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Pošlji preskusno oddajo ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Pošlji predsedniško opozorilo za CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Pošlji izjemno opozorilo za CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Pošlji hudo opozorilo za CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Pošlji opozorilo AMBER za CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Pošlji mesečno preskusno opozorilo za CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Pošlji 7-bitno preskusno oddajo GSM"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Pošlji 7-bitno preskusno oddajo UMTS"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Pošlji 7-bitno celotno oddajo GSM"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Pošlji 7-bitno celotno oddajo UMTS"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Pošlji 7-bitno večstransko oddajo GSM"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Pošlji 7-bitno večstransko oddajo UMTS"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Pošlji 7-bitno oddajo GSM z jezikom"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Pošlji 7-bitno sporočilo GSM z jezikom v telesu"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Pošlji 7-bitni UMTS z jezikom"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Pošlji preskusno oddajo GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Pošlji preskusno oddajo UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Pošlji večstransko oddajo UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Pošlji GSM UCS-2 z jezikom"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Pošlji UMTS UCS-2 z jezikom"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Pred pošiljanjem počakaj 5 sekund"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID sporočila:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorija:"</string>
 </resources>
diff --git a/tests/testapp/res/values-sq-rAL/strings.xml b/tests/testapp/res/values-sq-rAL/strings.xml
deleted file mode 100644
index 29d80e3..0000000
--- a/tests/testapp/res/values-sq-rAL/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Provat e transmetimit celular"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Dërgo transmetimin normal të ETWS-së"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Dërgo transmetimin e anulimit të ETWS-së"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Dërgo transmetimin provë të ETWS-së"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Dërgo alarmin presidencial të CMAS-së"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Dërgo alarmin ekstrem të CMAS-së"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Dërgo alarmin e rëndë të CMAS-së"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Dërgo alarmin \"Amber\" të CMAS-së"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Dërgo alarmin e provës mujore të CMAS-së"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Dërgo transmetimin provë 7-bitësh të GSM-së"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Dërgo transmetimin provë 7-bitësh të UMTS-së"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Dërgo transmetimin me gjatësi të plotë 7-bitëshe të GSM-së"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Dërgo transmetimin me gjatësi të plotë 7-bitëshe të UMTS-së"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Dërgo transmetimin shumëfaqësh 7-bitësh të GSM-së"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Dërgo transmetimin shumëfaqësh 7-bitëshe të UMTS-së"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Dërgo transmetimin 7-bitësh të GSM-së me gjuhën e integruar"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Dërgo transmetimin 7-bitësh të GSM-së me gjuhën e integruar në trup"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Dërgo transmetimin 7-bitësh të UMTS-së me gjuhën e integruar"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Dërgo transmetimin provë UCS-2 GSM"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Dërgo transmetimin provë UCS-2 UMTS"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Dërgo transmetimin shumëfaqësh UCS-2 UMTS"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Dërgo transmetimin UCS-2 GSM me gjuhën e integruar"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Dërgo transmetimin UCS-2 UMTS me gjuhën e integruar"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Vonesë 5 sekonda para dërgimit"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID-ja e mesazhit:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategoria:"</string>
-</resources>
diff --git a/tests/testapp/res/values-sq/strings.xml b/tests/testapp/res/values-sq/strings.xml
new file mode 100644
index 0000000..77251da
--- /dev/null
+++ b/tests/testapp/res/values-sq/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Provat e transmetimit celular"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Dërgo transmetimin ETWS për tërmet"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Dërgo transmetimin ETWS për cunam"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Dërgo transmetimin ETWS për tërmet dhe cunam"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Dërgo një transmetim ETWS për urgjenca të tjera"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Dërgo transmetimin e anulimit të ETWS-së"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Dërgo transmetimin provë të ETWS-së"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Dërgo alarmin presidencial të CMAS-së"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Dërgo alarmin ekstrem të CMAS-së"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Dërgo alarmin e rëndë të CMAS-së"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Dërgo alarmin \"Amber\" të CMAS-së"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Dërgo alarmin e provës mujore të CMAS-së"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Dërgo transmetimin provë 7-bitësh të GSM-së"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Dërgo transmetimin provë 7-bitësh të UMTS-së"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Dërgo transmetimin me gjatësi të plotë 7-bitëshe të GSM-së"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Dërgo transmetimin me gjatësi të plotë 7-bitëshe të UMTS-së"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Dërgo transmetimin shumëfaqësh 7-bitësh të GSM-së"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Dërgo transmetimin shumëfaqësh 7-bitëshe të UMTS-së"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Dërgo transmetimin 7-bitësh të GSM-së me gjuhën e integruar"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Dërgo transmetimin 7-bitësh të GSM-sëshe me gjuhën e integruar në trup"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Dërgo transmetimin 7-bitësh të UMTS-së me gjuhën e integruar"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Dërgo transmetimin provë UCS-2 GSM"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Dërgo transmetimin provë UCS-2 UMTS"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Dërgo transmetimin shumëfaqësh UCS-2 UMTS"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Dërgo transmetimin UCS-2 GSM me gjuhën e integruar"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Dërgo transmetimin UCS-2 UMTS me gjuhën e integruar"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Vonesë 5 sekonda para dërgimit"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID-ja e mesazhit:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategoria:"</string>
+</resources>
diff --git a/tests/testapp/res/values-sr/strings.xml b/tests/testapp/res/values-sr/strings.xml
index 900b288..d214f0c 100644
--- a/tests/testapp/res/values-sr/strings.xml
+++ b/tests/testapp/res/values-sr/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Тестирања инфо сервиса"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Пошаљи нормално ETWS емитовање"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Пошаљи ETWS емитовање за отказивање"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Пошаљи пробно ETWS емитовање"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Пошаљи CMAS председничко упозорење"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Пошаљи CMAS упозорење о екстремној опасности"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Пошаљи CMAS обавештење о озбиљној опасности"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Пошаљи CMAS AMBER упозорење"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Пошаљи CMAS месечно пробно упозорење"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Пошаљи 7-битно пробно GSM емитовање"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Пошаљи 7-битно пробно UMTS емитовање"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Пошаљи целокупно 7-битно GSM емитовање"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Пошаљи целокупно 7-битно UMTS емитовање"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Пошаљи 7-битно GSM емитовање на више страна"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Пошаљи 7-битно UMTS емитовање на више страна"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Пошаљи 7-битни GSM са језиком"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Пошаљи 7-битни  GSM са језиком у телу поруке"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Пошаљи 7-битни UMTS са језиком"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Пошаљи GSM UCS-2 пробно емитовање"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Пошаљи пробно UMTS UCS-2 емитовање"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Пошаљи UMTS UCS-2 емитовање на више страна"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Пошаљи GSM UCS-2 са језиком"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Пошаљи UMTS UCS-2 са језиком"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Кашњење од пет секунди пре слања"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ИД поруке:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Категорија:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Тестирања инфо сервиса"</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>
+    <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_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 AMBER упозорење"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Пошаљи CMAS месечно пробно упозорење"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Пошаљи 7-битно пробно GSM емитовање"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Пошаљи 7-битно пробно UMTS емитовање"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Пошаљи целокупно 7-битно GSM емитовање"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Пошаљи целокупно 7-битно UMTS емитовање"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Пошаљи 7-битно GSM емитовање на више страна"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Пошаљи 7-битно UMTS емитовање на више страна"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Пошаљи 7-битни GSM са језиком"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Пошаљи 7-битни GSM са језиком у телу поруке"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Пошаљи 7-битни UMTS са језиком"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Пошаљи GSM UCS-2 пробно емитовање"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Пошаљи пробно UMTS UCS-2 емитовање"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Пошаљи UMTS UCS-2 емитовање на више страна"</string>
+    <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">"ИД поруке:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Категорија:"</string>
 </resources>
diff --git a/tests/testapp/res/values-sv/strings.xml b/tests/testapp/res/values-sv/strings.xml
index 0596156..7fc8fe5 100644
--- a/tests/testapp/res/values-sv/strings.xml
+++ b/tests/testapp/res/values-sv/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Cell Broadcast-test"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Skicka en normal sändning från ETWS (Earthquake and Tsunami Warning System)"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Skicka ETWS avbryt sändning"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Skicka ETWS testsändning"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Skicka varningar utfärdade av presidenten via CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Skicka varningar om extrem fara via CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Skicka varningar om allvarlig fara via CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Skicka AMBER-meddelanden via CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Skicka månatliga testvarningar via CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Skicka GSM 7-bitars testsändning"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Skicka UMTS 7-bitars testsändning"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Skicka GSM 7-bitars fullängdssändning"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Skicka UMTS 7-bitars fullängdssändning"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Skicka GSM 7-bitars flersidig sändning"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Skicka UMTS 7-bitars flersidig sändning"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Skicka GSM 7-bitars med språk"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Skicka GSM 7-bitars med språkkoden i brödtexten"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Skicka UMTS 7-bitars med språk"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Skicka GSM UCS-2 testsändning"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Skicka UMTS UCS-2 testsändning"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Skicka UMTS UCS-2 flersidig sändning"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Skicka GSM UCS-2 med språk"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Skicka UMTS UCS-2 med språk"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Fördröj 5 sekunder före sändning"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Meddelande-ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategori:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Cellsändningstest"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Gör en jordbävningssändning från ETWS (Earthquake and Tsunami Warning System)"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Gör en tsunamisändning från ETWS (Earthquake and Tsunami Warning System)"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Gör en jordbävnings- och tsunamisändning från ETWS (Earthquake and Tsunami Warning System)"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Gör en annan nödsituationssändning från ETWS (Earthquake and Tsunami Warning System)"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Skicka ETWS avbryt sändning"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Skicka ETWS testsändning"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Skicka varningar utfärdade av presidenten via CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Skicka varningar om extrem fara via CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Skicka varningar om allvarlig fara via CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Skicka AMBER-meddelanden via CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Skicka månatliga testvarningar via CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Skicka GSM 7-bitars testsändning"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Skicka UMTS 7-bitars testsändning"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Skicka GSM 7-bitars fullängdssändning"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Skicka UMTS 7-bitars fullängdssändning"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Skicka GSM 7-bitars flersidig sändning"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Skicka UMTS 7-bitars flersidig sändning"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Skicka GSM 7-bitars med språk"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Skicka GSM 7-bitars med språkkoden i brödtexten"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Skicka UMTS 7-bitars med språk"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Skicka GSM UCS-2 testsändning"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Skicka UMTS UCS-2 testsändning"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Skicka UMTS UCS-2 flersidig sändning"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Skicka GSM UCS-2 med språk"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Skicka UMTS UCS-2 med språk"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Fördröj 5 sekunder före sändning"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Meddelande-id:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategori:"</string>
 </resources>
diff --git a/tests/testapp/res/values-sw/strings.xml b/tests/testapp/res/values-sw/strings.xml
index adecd5d..4ab618d 100644
--- a/tests/testapp/res/values-sw/strings.xml
+++ b/tests/testapp/res/values-sw/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Majaribio ya Matangazo ya Simu"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Tuma Matangazo ya Kawaida ya ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Tuma ETWS ya Kughairi Matangazo"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Tuma Tangazo la jaribio  la ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Tuma Arifu ya Rais ya CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Tuma Arifu Kali ya CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Tuma Arifu Kali ya CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Tuma Arifu ya CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Tuma Arifu ya Jaribio la Kila Mwezi la CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Tuma Biti ya GSM 7 ya Jaribio la Tangazo"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Tuma Biti UMTS 7 ya Jaribio la Matangazo"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Tuma tangazo la urefu kamili wa  GSM 7"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Tuma Tangazo la urefu kamili wa Biti ya UMTS 7"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Tuma tangazo la Biti GSM 7 ya Ukurasa"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Tuma Tangazo l Kurasa Nyingi la Biti 7 za UMTS"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Tuma Biti GSM 7 ya Upana Kamilifu  wa Matangazo"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Tuma biti ya GSM 7 Na Lugha Katika Kiini"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Tuma Biti ya UMTS 7 na Lugha"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Tuma Tangazo la jaribio la GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Tuma Jaribio la Tangazo la  UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Tuma UMTS UCS-2  ya Ukurasa Anuwai wa Matangazo"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Tuma GSM UCS-2 na Lugha"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Tuma  UMTS UCS-2 na Lugha"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Chelewesha sekunde 5 kabla ya kutuma"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Kitambulisho cha Ujumbe:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kitengo:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Majaribio ya Matangazo ya Simu"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Tuma Tangazo la Tetemeko la ardhi la ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Tuma Tangazo la Tsunami la ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Tuma Tangazo la Tetemeko la radhi na Tsunami la ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Tuma Tangazo Lingine la Dharura ya ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Tuma ETWS ya Kughairi Matangazo"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Tuma Tangazo la jaribio la ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Tuma Arifa za CMAS za Rais"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Tuma Arifa za CMAS za Matukio Hatari ya Hali ya Anga"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Tuma Arifa za CMAS za Matukio Mabaya ya Hali ya Hewa"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Tuma Arifa za CMAS za AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Tuma Arifa za CMAS za Jaribio la Kila Mwezi"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Tuma Jaribio la Tangazo la Biti ya GSM 7"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Tuma Jaribio la Tangazo la Biti ya UMTS 7"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Tuma tangazo la Urefu Kamili wa Biti ya GSM 7"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Tuma Tangazo la Urefu Kamili wa Biti ya UMTS 7"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Tuma Tangazo la Kurasa Nyingi la Biti ya GSM 7"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Tuma Tangazo la Kurasa Nyingi la Biti ya UMTS 7"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Tuma Biti ya GSM 7 na Lugha"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Tuma Biti ya GSM 7 Na Lugha Katika Kiini"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Tuma Biti ya UMTS 7 na Lugha"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Tuma Tangazo la Jaribio la GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Tuma Tangazo la Jaribio la UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Tuma Tangazo la Kurasa Nyingi la UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Tuma GSM UCS-2 na Lugha"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Tuma UMTS UCS-2 na Lugha"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Kawia kwa sekunde 5 kabla ya kutuma"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Kitambulisho cha Ujumbe:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Aina:"</string>
 </resources>
diff --git a/tests/testapp/res/values-ta-rIN/strings.xml b/tests/testapp/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 6053a36..0000000
--- a/tests/testapp/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"செல் அலைபரப்புச் சோதனைகள்"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS இயல்பான அலைபரப்பை அனுப்பு"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS ரத்துசெய்தல் அலைபரப்பை அனுப்பு"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS சோதனை அலைபரப்பை அனுப்பு"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS ஜனாதிபதி விழிப்பூட்டலை அனுப்பு"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS எக்ஸ்ட்ரீம் விழிப்பூட்டலை அனுப்பு"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS கடுமையான விழிப்பூட்டலை அனுப்பு"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER விழிப்பூட்டலை அனுப்பு"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS மாதாந்திரச் சோதனை விழிப்பூட்டலை அனுப்பு"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 பிட் சோதனை அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 பிட் சோதனை அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 பிட் முழு நீள அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 பிட் முழு நீள அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 பிட் பல பக்க அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 பிட் பல பக்க அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"மொழியுடன் கூடிய GSM 7 பிட் ஐ அனுப்பு"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"மொழி வகையுடன் கூடிய GSM 7 பிட் ஐ அனுப்பு"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"மொழியுடன் கூடிய 7 பிட் UTMS ஐ அனுப்பு"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 சோதனை அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 சோதனை அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 பல பக்க அலைபரப்பை அனுப்பு"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"மொழியுடன் கூடிய GSM UCS-2 ஐ அனுப்பு"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"மொழியுடன் கூடிய UMTS UCS-2 ஐ அனுப்பு"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"அனுப்பும் முன்பு 5 வினாடிகள் தாமதமாக்கு"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"செய்தி ஐடி:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"வகை:"</string>
-</resources>
diff --git a/tests/testapp/res/values-ta/strings.xml b/tests/testapp/res/values-ta/strings.xml
new file mode 100644
index 0000000..12b10a9
--- /dev/null
+++ b/tests/testapp/res/values-ta/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"செல் பிராட்காஸ்ட் சோதனைகள்"</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>
+    <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_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 AMBER விழிப்பூட்டலை அனுப்பு"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS மாதாந்திரச் சோதனை விழிப்பூட்டலை அனுப்பு"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 பிட் சோதனை அலைபரப்பை அனுப்பு"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 பிட் சோதனை அலைபரப்பை அனுப்பு"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 பிட் முழு நீள அலைபரப்பை அனுப்பு"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 பிட் முழு நீள அலைபரப்பை அனுப்பு"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 பிட் பல பக்க அலைபரப்பை அனுப்பு"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 பிட் பல பக்க அலைபரப்பை அனுப்பு"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"மொழியுடன் கூடிய 7 பிட் GSMஐ அனுப்பு"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"மொழி வகையுடன் கூடிய 7 பிட் GSMஐ அனுப்பு"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"மொழியுடன் கூடிய 7 பிட் UMTSஐ அனுப்பு"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 சோதனை அலைபரப்பை அனுப்பு"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 சோதனை அலைபரப்பை அனுப்பு"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 பல பக்க அலைபரப்பை அனுப்பு"</string>
+    <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">"அனுப்பும் முன்பு 5 வினாடிகள் தாமதமாக்கு"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"செய்தி ஐடி:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"வகை:"</string>
+</resources>
diff --git a/tests/testapp/res/values-te-rIN/strings.xml b/tests/testapp/res/values-te-rIN/strings.xml
deleted file mode 100644
index 2fbc919..0000000
--- a/tests/testapp/res/values-te-rIN/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"సెల్ ప్రసార పరీక్షలు"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS సాధారణ ప్రసారాన్ని పంపు"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS రద్దు ప్రసారాన్ని పంపు"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS పరీక్ష ప్రసారాన్ని పంపు"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS అధ్యక్ష హెచ్చరికను పంపు"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS అత్యంత తీవ్ర హెచ్చరికను పంపు"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS తీవ్ర హెచ్చరికను పంపు"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS AMBER హెచ్చరికను పంపు"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS నెలవారీ పరీక్ష హెచ్చరికను పంపు"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 బిట్ పరీక్ష ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 బిట్ పరీక్ష ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 బిట్ పూర్తి స్థాయి ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 బిట్ పూర్తి స్థాయి ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 బిట్ బహుళ పేజీ ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 బిట్ బహుళ పేజీ ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"భాషతో GSM 7 బిట్‌ను పంపు"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"విషయంలో భాషతో GSM 7 బిట్‌ను పంపు"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"భాషతో UMTS 7 బిట్‌ను పంపు"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 పరీక్ష ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 పరీక్ష ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 బహుళ పేజీ ప్రసారాన్ని పంపు"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"భాషతో GSM UCS-2 పంపు"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"భాషతో UMTS UCS-2 పంపు"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"పంపడానికి ముందు 5 సెకన్లు ఆలస్యం చేయి"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"సందేశం ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"వర్గం:"</string>
-</resources>
diff --git a/tests/testapp/res/values-te/strings.xml b/tests/testapp/res/values-te/strings.xml
new file mode 100644
index 0000000..81eda77
--- /dev/null
+++ b/tests/testapp/res/values-te/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"సెల్ ప్రసార పరీక్షలు"</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>
+    <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_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 AMBER హెచ్చరికను పంపు"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS నెలవారీ పరీక్ష హెచ్చరికను పంపు"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 బిట్ పరీక్ష ప్రసారాన్ని పంపు"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 బిట్ పరీక్ష ప్రసారాన్ని పంపు"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 బిట్ పూర్తి నిడివి ప్రసారాన్ని పంపు"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 బిట్ పూర్తి నిడివి ప్రసారాన్ని పంపు"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 బిట్ బహుళ పేజీల ప్రసారాన్ని పంపు"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 బిట్ బహుళ పేజీల ప్రసారాన్ని పంపు"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"భాషతో GSM 7 బిట్‌ను పంపు"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"విషయంలో భాషతో GSM 7 బిట్‌ను పంపు"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"భాషతో UMTS 7 బిట్‌ను పంపు"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 పరీక్ష ప్రసారాన్ని పంపు"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 పరీక్ష ప్రసారాన్ని పంపు"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 బహుళ పేజీల ప్రసారాన్ని పంపు"</string>
+    <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">"పంపడానికి ముందు 5 సెకన్లు జాప్యం చేయి"</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-th/strings.xml b/tests/testapp/res/values-th/strings.xml
index b43dd7e..39ffe88 100644
--- a/tests/testapp/res/values-th/strings.xml
+++ b/tests/testapp/res/values-th/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"การทดสอบการส่งข้อมูลเตือนภัยทางมือถือ"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ส่งการแจ้งเตือน ETWS ปกติ"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ส่งการกระจายข้อมูลยกเลิก ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ส่งการกระจายข้อมูลทดสอบ ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"ส่งการแจ้งเตือน CMAS ระดับสูง"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"ส่งการแจ้งเตือน CMAS ระดับสูงสุด"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"ส่งการแจ้งเตือน CMAS ระดับร้ายแรง"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"ส่งการแจ้งเตือน CMAS ระดับ AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"ส่งการแจ้งเตือนทดสอบประจำเดือนของ CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"ส่งการกระจายข้อมูลทดสอบ GSM 7 บิต"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"ส่งการกระจายข้อมูลทดสอบ UMTS 7 บิต"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"ส่งการกระจายข้อมูลเต็มความยาว GSM 7 บิต"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"ส่งการกระจายข้อมูลเต็มความยาว UMTS 7 บิต"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"ส่งการกระจายข้อมูลแบบหลายหน้า GSM 7 บิต"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"ส่งการกระจายข้อมูลแบบหลายหน้า UMTS 7 บิต"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"ส่ง GSM 7 บิตด้วยภาษา"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"ส่ง GSM 7 บิตด้วยภาษาในเนื้อหา"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"ส่ง UMTS 7 บิตด้วยภาษา"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"ส่งการกระจายข้อมูลทดสอบ GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"ส่งการกระจายข้อมูลทดสอบ UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"ส่งการกระจายข้อมูลแบบหลายหน้า UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"ส่ง GSM UCS-2 ด้วยภาษา"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"ส่ง UMTS UCS-2 ด้วยภาษา"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"หน่วงเวลา 5 วินาทีก่อนที่จะส่ง"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"รหัสข้อความ:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"หมวดหมู่:"</string>
+    <string name="app_label" msgid="2704349695846064655">"การทดสอบการส่งข้อมูลเตือนภัยทางมือถือ (CB)"</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>
+    <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_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 ระดับ AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"ส่งการแจ้งเตือนทดสอบประจำเดือนของ CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"ส่งการกระจายข้อมูลทดสอบ GSM 7 บิต"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"ส่งการกระจายข้อมูลทดสอบ UMTS 7 บิต"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"ส่งการกระจายข้อมูลเต็มความยาว GSM 7 บิต"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"ส่งการกระจายข้อมูลเต็มความยาว UMTS 7 บิต"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"ส่งการกระจายข้อมูลแบบหลายหน้า GSM 7 บิต"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"ส่งการกระจายข้อมูลแบบหลายหน้า UMTS 7 บิต"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"ส่ง GSM 7 บิตด้วยภาษา"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"ส่ง GSM 7 บิตด้วยภาษาในเนื้อหา"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"ส่ง UMTS 7 บิตด้วยภาษา"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"ส่งการกระจายข้อมูลทดสอบ GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"ส่งการกระจายข้อมูลทดสอบ UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"ส่งการกระจายข้อมูลแบบหลายหน้า UMTS UCS-2"</string>
+    <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">"หน่วงเวลา 5 วินาทีก่อนส่ง"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"รหัสข้อความ:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"หมวดหมู่:"</string>
 </resources>
diff --git a/tests/testapp/res/values-tl/strings.xml b/tests/testapp/res/values-tl/strings.xml
index dece3b4..01fdad0 100644
--- a/tests/testapp/res/values-tl/strings.xml
+++ b/tests/testapp/res/values-tl/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Mga Pagsubok sa Cell Broadcast"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Ipadala ang Normal na Broadcast ng ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Ipadala ang ETWS Cancel Broadcast"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Ipadala ang ETWS Test Broadcast"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Magpadala ng Presidential Alert ng CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Magpadala ng Extreme Alert ng CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Magpadala ng Severe Alert ng CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Magpadala ng AMBER Alert ng CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Magpadala ng Buwanang Pansubok na Alerto ng CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Ipadala ang GSM 7 Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Ipadala ang UMTS 7 Bit Test Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Ipadala ang GSM 7 Bit Full Length Broadcast"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Ipadala ang UMTS 7 Bit Full Length Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Ipadala ang GSM 7 Bit Multi Page Broadcast"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Ipadala ang UMTS 7 Bit Multi Page Broadcast"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Ipadala ang GSM 7 Bit With Language"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Magpadala ng GSM 7 Bit with Language Sa Nilalaman"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Ipadala ang UMTS 7 Bit With Language"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Ipadala ang GSM UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Ipadala ang UMTS UCS-2 Test Broadcast"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Ipadala ang UMTS UCS-2 Multi Page Broadcast"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Ipadala ang GSM UCS-2 na May Wika"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Ipadala ang UMTS UCS-2 With Language"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Iantala ng 5 segundo bago ipadala"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID ng Mensahe:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategorya:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Mga Pagsubok sa Cell Broadcast"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Magpadala ng Pag-broadcast ng Lindol na ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Magpadala ng Pag-broadcast ng Tsunami na ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Magpadala ng Pag-broadcast ng Lindol at Tsunami na ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Magpadala ng Pag-broadcast ng Iba Pang Emergency na ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Ipadala ang Kanselahin ang Broadcast ng ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Ipadala ang Panubok na Broadcast ng ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Magpadala ng Presidential Alert ng CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Magpadala ng Extreme Alert ng CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Magpadala ng Severe Alert ng CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Magpadala ng AMBER Alert ng CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Magpadala ng Buwanang Pansubok na Alerto ng CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Ipadala ang GSM 7 Bit Test Broadcast"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Ipadala ang UMTS 7 Bit Test Broadcast"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Ipadala ang GSM 7 Bit Full Length Broadcast"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Ipadala ang UMTS 7 Bit Full Length Broadcast"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Ipadala ang GSM 7 Bit Multi Page Broadcast"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Ipadala ang UMTS 7 Bit Multi Page Broadcast"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Ipadala ang GSM 7 Bit With Language"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Ipadala ang GSM 7 Bit With Language In Body"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Ipadala ang UMTS 7 Bit With Language"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Ipadala ang GSM UCS-2 Test Broadcast"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Ipadala ang UMTS UCS-2 Test Broadcast"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Ipadala ang UMTS UCS-2 Multi Page Broadcast"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Ipadala ang GSM UCS-2 With Language"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Ipadala ang UMTS UCS-2 With Language"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Iantala ng 5 segundo bago ipadala"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Message ID:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategorya:"</string>
 </resources>
diff --git a/tests/testapp/res/values-tr/strings.xml b/tests/testapp/res/values-tr/strings.xml
index 20f01f4..545becf 100644
--- a/tests/testapp/res/values-tr/strings.xml
+++ b/tests/testapp/res/values-tr/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Hücre Yayını Testleri"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"ETWS Normal Yayınlarını Gönder"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"ETWS İptal Yayınlarını Gönder"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"ETWS Test Yayınlarını Gönder"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Başkanlık CMAS Uyarısı gönder"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Ekstrem CMAS Uyarısı gönder"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Şiddetli CMAS Uyarısı gönder"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"AMBER CMAS Uyarısı gönder"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Aylık CMAS Test Uyarısı gönder"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"GSM 7 Bit Test Yayınlarını Gönder"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"UMTS 7 Bit Test Yayınlarını Gönder"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"GSM 7 Bit Tam Uzunlukta Yayınları Gönder"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"UMTS 7 Bit Tam Uzunlukta Yayınları Gönder"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"GSM 7 Bit Çok Sayfalı Yayınları Gönder"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"UMTS 7 Bit Çok Sayfalı Yayınları Gönder"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"GSM 7 Bit\'i Dil Koduyla Gönder"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Gövde Metni İçinde GSM 7 Bit Dil Koduyla Gönder"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"UMTS 7 Bit\'i Dil Koduyla Gönder"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 Test Yayınlarını Gönder"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 Test Yayınlarını Gönder"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"UMTS UCS-2 Çok Sayfalı Yayınları Gönder"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2\'yi Dil Koduyla gönder"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2\'yi Dil Koduyla gönder"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Göndermeden önce 5 saniye beklet"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Mesaj Kimliği:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Kategori:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Hücre Yayını Testleri"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"ETWS Deprem Yayını Gönder"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"ETWS Tsunami Yayını Gönder"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"ETWS Deprem ve Tsunami Yayını Gönder"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"ETWS Diğer Acil Durum Yayını Gönder"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"ETWS İptal Yayınlarını Gönder"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"ETWS Test Yayınlarını Gönder"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Başkanlık CMAS Uyarısı gönder"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Ekstrem CMAS Uyarısı gönder"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Ciddi Önem Düzeyinde CMAS Uyarısı gönder"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"AMBER CMAS Uyarısı gönder"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Aylık CMAS Test Uyarısı gönder"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"GSM 7 Bit Test Yayınlarını Gönder"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"UMTS 7 Bit Test Yayınlarını Gönder"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"GSM 7 Bit Tam Uzunlukta Yayınları Gönder"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"UMTS 7 Bit Tam Uzunlukta Yayınları Gönder"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"GSM 7 Bit Çok Sayfalı Yayınları Gönder"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"UMTS 7 Bit Çok Sayfalı Yayınları Gönder"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"GSM 7 Bit\'i Dil Koduyla Gönder"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Gövde Metni İçinde GSM 7 Bit Dil Koduyla Gönder"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"UMTS 7 Bit\'i Dil Koduyla Gönder"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 Test Yayınlarını Gönder"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 Test Yayınlarını Gönder"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"UMTS UCS-2 Çok Sayfalı Yayınları Gönder"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"GSM UCS-2\'yi Dil Koduyla gönder"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"UMTS UCS-2\'yi Dil Koduyla gönder"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Göndermeden önce 5 saniye beklet"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Mesaj Kimliği:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Kategori:"</string>
 </resources>
diff --git a/tests/testapp/res/values-uk/strings.xml b/tests/testapp/res/values-uk/strings.xml
index 13071aa..bd79812 100644
--- a/tests/testapp/res/values-uk/strings.xml
+++ b/tests/testapp/res/values-uk/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Тестування програми Cell Broadcast"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Надіслати звичайне широкомовне повідомлення системи ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Надіслати широкомовне повідомлення системи ETWS про скасування"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Надіслати пробне широкомовне повідомлення системи ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Надіслати президентське сповіщення CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Надіслати сповіщення CMAS надзвичайного рівня"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Надіслати сповіщення CMAS високого рівня"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Надіслати сповіщення CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Надіслати щомісячне тестове сповіщення CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Надіслати пробне широкомовне GSM-повідомлення зі швидкістю 7 біт"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Надіслати пробне широкомовне UMTS-повідомлення зі швидкістю 7 біт"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Надіслати повнометражне широкомовне GSM-повідомлення зі швидкістю 7 біт"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Надіслати повнометражне широкомовне UMTS-повідомлення зі швидкістю 7 біт"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Надіслати багатосторнікове широкомовне GSM-повідомлення зі швидкістю 7 біт"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Надіслати багатосторнікове широкомовне UMTS-повідомлення зі швидкістю 7 біт"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Надіслати GSM-повідомлення зі швидкістю 7 біт для мови"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Надіслати 7-бітне GSM-сповіщення з кодом мови в тексті"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Надіслати UMTS-повідомлення зі швидкістю 7 біт для мови"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Надіслати пробне широкомовне GSM-повідомлення з кодуванням UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Надіслати пробне широкомовне UMTS-повідомлення з кодуванням UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Надіслати багатосторінкове широкомовне UMTS-повідомлення з кодуванням UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Надіслати GSM-повідомлення з кодуванням UCS-2 для мови"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Надіслати UMTS-повідомлення з кодуванням UCS-2 для мови"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Затримка 5 секунд перед надсиланням"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Ідентифікатор повідомлення:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Категорія:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Тестування додатка Cell Broadcast"</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>
+    <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_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 AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Надіслати щомісячне тестове сповіщення CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Надіслати пробне широкомовне 7-бітове сповіщення GSM"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Надіслати пробне широкомовне 7-бітове сповіщення UMTS"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Надіслати повнометражне широкомовне 7-бітове сповіщення GSM"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Надіслати повнометражне широкомовне 7-бітове сповіщення UMTS"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Надіслати багатосторнікове широкомовне 7-бітове сповіщення GSM"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Надіслати багатосторнікове широкомовне 7-бітове сповіщення UMTS"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Надіслати 7-бітове сповіщення GSM із кодом мови"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Надіслати 7-бітове сповіщення GSM із кодом мови в тілі"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Надіслати 7-бітове сповіщення UMTS із кодом мови"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Надіслати пробне широкомовне сповіщення GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Надіслати пробне широкомовне сповіщення UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Надіслати багатосторінкове широкомовне сповіщення UMTS UCS-2"</string>
+    <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">"Затримка 5 секунд перед надсиланням"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Ідентифікатор сповіщення:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Категорія:"</string>
 </resources>
diff --git a/tests/testapp/res/values-ur-rPK/strings.xml b/tests/testapp/res/values-ur-rPK/strings.xml
deleted file mode 100644
index 4593760..0000000
--- a/tests/testapp/res/values-ur-rPK/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"سیل براڈکاسٹ کے ٹیسٹس"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"‏ETWS عمومی براڈکاسٹ بھیجیں"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"‏ETWS منسوخی براڈکاسٹ بھیجیں"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"‏ETWS ٹیسٹ براڈکاسٹ بھیجیں"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"‏CMAS صدارتی الرٹ بھیجیں"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"‏CMAS انتہائی الرٹ بھیجیں"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"‏CMAS شدید الرٹ بھیجیں"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"‏CMAS AMBER الرٹ بھیجیں"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"‏CMAS ماہانہ ٹیسٹ الرٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"‏GSM 7 بٹ ٹیسٹ براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"‏UMTS 7 بٹ ٹیسٹ براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"‏GSM 7 بٹ پوری لمبائی کا براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"‏UMTS 7 بٹ پوری لمبائی کا براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"‏GSM 7 بٹ کثیر صفحاتی براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"‏UMTS 7 بٹ کثیر صفحاتی براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"‏زبان کے ساتھ GSM 7 بٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"‏نفس مضمون میں زبان کے ساتھ GSM 7 بٹ بھیجیں"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"‏زبان کے ساتھ UMTS 7 بٹ بھیجیں"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"‏GSM UCS-2 ٹیسٹ براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"‏UMTS UCS-2 ٹیسٹ براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"‏UMTS UCS-2 کثیر صفحاتی براڈکاسٹ بھیجیں"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"‏GSM UCS-2 زبان کے ساتھ بھیجیں"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"‏UMTS UCS-2 زبان کے ساتھ بھیجیں"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"بھیجنے سے پہلے 5 سیکنڈز تک مؤخر کریں"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"‏پیغام ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"زمرہ:"</string>
-</resources>
diff --git a/tests/testapp/res/values-ur/strings.xml b/tests/testapp/res/values-ur/strings.xml
new file mode 100644
index 0000000..635cced
--- /dev/null
+++ b/tests/testapp/res/values-ur/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"سیل براڈکاسٹ کے ٹیسٹس"</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>
+    <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_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 AMBER الرٹ بھیجیں"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"‏CMAS ماہانہ ٹیسٹ الرٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"‏GSM 7 بٹ ٹیسٹ براڈکاسٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"‏UMTS 7 بٹ ٹیسٹ براڈکاسٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"‏GSM 7 بٹ پوری لمبائی کا براڈکاسٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"‏UMTS 7 بٹ پوری لمبائی کا براڈکاسٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"‏GSM 7 بٹ کثیر صفحاتی براڈکاسٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"‏UMTS 7 بٹ کثیر صفحاتی براڈکاسٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"‏زبان کے ساتھ GSM 7 بٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"‏نفس مضمون میں زبان کے ساتھ GSM 7 بٹ بھیجیں"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"‏زبان کے ساتھ UMTS 7 بٹ بھیجیں"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"‏GSM UCS-2 جانچ کا نشریہ بھیجیں"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"‏UMTS UCS-2 ٹیسٹ براڈکاسٹ بھیجیں"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"‏UMTS UCS-2 کثیر صفحاتی براڈکاسٹ بھیجیں"</string>
+    <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">"بھیجنے سے پہلے 5 سیکنڈز تک مؤخر کریں"</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-uz-rUZ/strings.xml b/tests/testapp/res/values-uz-rUZ/strings.xml
deleted file mode 100644
index dd5edbd..0000000
--- a/tests/testapp/res/values-uz-rUZ/strings.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2102435118079140813">"Aholini ogohlantirish sinovlari"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Zilzila va sunamidan ogohlantirish tizimining odatiy tarqatma xabarini yuborish"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Zilzila va sunamidan ogohlantirish tizimi xabarining bekor qilinganligi to‘g‘risidagi tarqatma xabarni yuborish"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Zilzila va sunamidan ogohlantirish tizimining sinov tarqatma xabarini yuborish"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"CMAS orqali hukumat ogohlantirishini yuborish"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"CMAS orqali keskin ogohlantirishni yuborish"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"CMAS orqali jiddiy ogohlantirishni yuborish"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"CMAS orqali AMBER ogohlantirishini yuborish"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"CMAS orqali oylik sinov ogohlantirishini yuborish"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"7-bitlik GSM sinov tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"7-bitlik UMTS sinov tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"7-bitlik to‘liq uzunlikdagi GSM tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"7-bitlik to‘liq uzunlikdagi UMTS tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"7-bitlik ko‘p sahifali GSM tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"7-bitlik ko‘p sahifali UMTS tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"7-bitlik GSM tarqatma xabarini tili ko‘rsatilgan holda yuborish"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"7-bitlik GSM tarqatma xabarini matnda tili ko‘rsatilgan holda yuborish"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"7-bitlik UMTS tarqatma xabarini tili ko‘rsatilgan holda yuborish"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"GSM UCS-2 sinov tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"UMTS UCS-2 sinov tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Ko‘p sahifali UMTS UCS-2 tarqatma xabarini yuborish"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"GSM UCS-2 tarqatma xabarini tili ko‘rsatilgan holda yuborish"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 tarqatma xabarini tili ko‘rsatilgan holda yuborish"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Yuborishdan oldin 5 soniya kechiktirish"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"Xabar ID raqami:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Toifa:"</string>
-</resources>
diff --git a/tests/testapp/res/values-uz/strings.xml b/tests/testapp/res/values-uz/strings.xml
new file mode 100644
index 0000000..3e12537
--- /dev/null
+++ b/tests/testapp/res/values-uz/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_label" msgid="2704349695846064655">"Aholini ogohlantirish sinovlari"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"ETWS zilziladan ogohlantirish tarqatma xabarini yuborish"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"ETWS sunamidan ogohlantirish tarqatma xabarini yuborish"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"ETWS zilzila va sunamidan ogohlantirish tarqatma xabarini yuborish"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"ETWS boshqa favqulodda holatlar bo‘yicha tarqatma xabarini yuborish"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Zilzila va sunamidan ogohlantirish tizimi xabarining bekor qilinganligi to‘g‘risidagi tarqatma xabarni yuborish"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Zilzila va sunamidan ogohlantirish tizimining sinov tarqatma xabarini yuborish"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"CMAS orqali hukumat ogohlantirishini yuborish"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"CMAS orqali keskin ogohlantirishni yuborish"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"CMAS orqali jiddiy ogohlantirishni yuborish"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"CMAS orqali AMBER ogohlantirishini yuborish"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"CMAS orqali oylik sinov ogohlantirishini yuborish"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"7-bitlik GSM sinov tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"7-bitlik UMTS sinov tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"7-bitlik to‘liq uzunlikdagi GSM tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"7-bitlik to‘liq uzunlikdagi UMTS tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"7-bitlik ko‘p sahifali GSM tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"7-bitlik ko‘p sahifali UMTS tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"7-bitlik GSM tarqatma xabarini tili ko‘rsatilgan holda yuborish"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"7-bitlik GSM tarqatma xabarini matnda tili ko‘rsatilgan holda yuborish"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"7-bitlik UMTS tarqatma xabarini tili ko‘rsatilgan holda yuborish"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"GSM UCS-2 sinov tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"UMTS UCS-2 sinov tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Ko‘p sahifali UMTS UCS-2 tarqatma xabarini yuborish"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"GSM UCS-2 tarqatma xabarini tili ko‘rsatilgan holda yuborish"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"UMTS UCS-2 tarqatma xabarini tili ko‘rsatilgan holda yuborish"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Yuborishdan oldin 5 soniya kechiktirish"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"Xabar ID raqami:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Toifa:"</string>
+</resources>
diff --git a/tests/testapp/res/values-vi/strings.xml b/tests/testapp/res/values-vi/strings.xml
index a55c241..9759a6d 100644
--- a/tests/testapp/res/values-vi/strings.xml
+++ b/tests/testapp/res/values-vi/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Các thử nghiệm phát sóng trên di động"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Gửi chương trình phát sóng bình thường trên ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Phát thử nghiệm việc gửi lệnh Hủy ETWS"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Phát thử nghiệm việc gửi ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Gửi thông báo dành cho tổng thống cho CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Gửi thông báo cực kỳ nghiêm trọng cho CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Gửi thông báo nghiêm trọng cho CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Gửi thông báo AMBER cho CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Gửi thông báo kiểm tra hàng tháng cho CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Phát thử nghiệm trên nhiều trang việc gửi GSM 7 bit"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Phát thử nghiệm việc gửi UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Phát toàn bộ việc gửi GSM 7 bit"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Phát toàn bộ việc gửi UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Phát việc gửi GSM 7 bit trên nhiều trang"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Phát thử nghiệm trên nhiều trang việc gửi UMTS 7 bit"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Gửi GSM 7 bit có ngôn ngữ"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Gửi GSM 7 bit có ngôn ngữ cơ thể"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Gửi UMTS 7 bit có ngôn ngữ"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Phát thử nghiệm việc gửi GSM UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Phát thử nghiệm việc gửi UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Phát thử nghiệm trên nhiều trang việc gửi UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Gửi GSM UCS-2 bằng ngôn ngữ"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Gửi UMTS UCS-2 có ngôn ngữ"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Trễ 5 giây trước khi gửi"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"ID thư:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Danh mục:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Các thử nghiệm truyền phát trên di động"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Gửi Phát sóng về động đất của ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Gửi Phát sóng về sóng thần của ETWS"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Gửi Phát sóng về động đất và sóng thần của ETWS"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Gửi Phát sóng về tình huống khẩn cấp khác của ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Phát việc gửi lệnh hủy ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Phát thử nghiệm gửi ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Gửi thông báo của tổng thống cho CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Gửi thông báo nghiêm trọng cho CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Gửi thông báo nghiêm trọng cho CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Gửi thông báo AMBER cho CMAS"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Gửi thông báo kiểm tra hàng tháng cho CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Phát thử nghiệm trên nhiều trang việc gửi GSM 7 bit"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Phát thử nghiệm việc gửi UMTS 7 bit"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Phát toàn bộ việc gửi GSM 7 bit"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Phát toàn bộ việc gửi UMTS 7 bit"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Phát việc gửi GSM 7 bit trên nhiều trang"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Phát gửi UMTS 7 bit trên nhiều trang"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Gửi GSM 7 bit có ngôn ngữ"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Gửi GSM 7 bit có ngôn ngữ cơ thể"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Gửi UMTS 7 bit có ngôn ngữ"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Phát thử nghiệm việc gửi GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Phát thử nghiệm việc gửi UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Phát trên nhiều trang việc gửi UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Gửi GSM UCS-2 có ngôn ngữ"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Gửi UMTS UCS-2 có ngôn ngữ"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Trễ 5 giây trước khi gửi"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"ID tin nhắn:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Danh mục:"</string>
 </resources>
diff --git a/tests/testapp/res/values-zh-rCN/strings.xml b/tests/testapp/res/values-zh-rCN/strings.xml
index 82b63d0..3418f8e 100644
--- a/tests/testapp/res/values-zh-rCN/strings.xml
+++ b/tests/testapp/res/values-zh-rCN/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"小区广播测试"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"发送地震海啸警报系统的常规广播"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"发送地震海啸警报系统取消广播"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"发送地震海啸警报系统测试广播"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"发送 CMAS 总统警报"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"发送 CMAS 极端情况警报"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"发送 CMAS 严重情况警报"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"发送 CMAS 安珀警报"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"发送 CMAS 每月测试警报"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"发送GSM 7位测试广播"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"发送UMTS 7位测试广播"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"发送 GSM 7 位全长广播"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"发送 UMTS 7 位全长广播"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"发送 GSM 7 位多页广播"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"发送 UMTS 7 位多页广播"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"发送特定语言的 GSM 7 位编码信息"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"用正文的语言发送 GSM 7 位编码信息"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"发送特定语言的 UMTS 7 位编码信息"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"发送GSM UCS-2测试广播"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"发送UMTS UCS-2测试广播"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"发送 UMTS UCS-2 多页广播"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"发送特定语言的 GSM UCS-2 编码信息"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"发送特定语言的 UMTS UCS-2 编码信息"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"延迟5秒发送"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"讯息 ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"类别:"</string>
+    <string name="app_label" msgid="2704349695846064655">"小区广播测试"</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>
+    <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_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>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"发送 CMAS 每月测试警报"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"发送 GSM 7 位测试广播"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"发送 UMTS 7 位测试广播"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"发送 GSM 7 位全长广播"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"发送 UMTS 7 位全长广播"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"发送 GSM 7 位多页广播"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"发送 UMTS 7 位多页广播"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"发送 GSM 7 位编码信息,附加语言代码"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"发送 GSM 7 位编码信息,在正文中附加语言代码"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"发送 UMTS 7 位编码信息,附加语言代码"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"发送 GSM UCS-2 测试广播"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"发送 UMTS UCS-2 测试广播"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"发送 UMTS UCS-2 多页广播"</string>
+    <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">"延迟 5 秒发送"</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-zh-rHK/strings.xml b/tests/testapp/res/values-zh-rHK/strings.xml
index 68f8f80..6cc6cb6 100644
--- a/tests/testapp/res/values-zh-rHK/strings.xml
+++ b/tests/testapp/res/values-zh-rHK/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"區域廣播測試"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"傳送 ETWS 正常廣播"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"傳送 ETWS 取消廣播"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"傳送 ETWS 測試廣播"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"傳送 CMAS 總統級警示"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"傳送 CMAS 極嚴重警示"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"傳送 CMAS 嚴重警示"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"傳送 CMAS 黃色警示"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"傳送 CMAS 每月測試警示"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"傳送 GSM 7 位元多字碼頁廣播"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"傳送 UMTS 7 位元測試廣播"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"傳送 GSM 7 位元全長廣播"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"傳送 UMTS 7 位元全長廣播"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"傳送 GSM 7 位元多字碼頁廣播"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"傳送 UMTS 7 位元多字碼頁廣播"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"傳送特定語言的 GSM 7 位元訊息"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"在本文中傳送 GSM 7 位元訊息,附加語言代碼"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"傳送特定語言的 UMTS 7 位元訊息"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"傳送 GSM UCS-2 測試廣播"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"傳送 UMTS UCS-2 測試廣播"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"傳送 UMTS UCS-2 多字碼頁廣播"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"傳送特定語言的 GSM UCS-2 訊息"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"傳送特定語言的 UMTS UCS-2 訊息"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"傳送前延遲 5 秒"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"訊息編號:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"類別:"</string>
+    <string name="app_label" msgid="2704349695846064655">"區域廣播測試"</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>
+    <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_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>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"傳送 CMAS 每月測試警示"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"傳送 GSM 7 位元測試廣播"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"傳送 UMTS 7 位元測試廣播"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"傳送 GSM 7 位元完整廣播"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"傳送 UMTS 7 位元完整廣播"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"傳送 GSM 7 位元多頁廣播"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"傳送 UMTS 7 位元多頁廣播"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"傳送 GSM 7 位元訊息,附加語言代碼"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"在本文中傳送 GSM 7 位元訊息,附加語言代碼"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"傳送 UMTS 7 位元訊息,附加語言代碼"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"傳送 GSM UCS-2 測試廣播"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"傳送 UMTS UCS-2 測試廣播"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"傳送 UMTS UCS-2 多頁廣播"</string>
+    <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">"傳送前延遲 5 秒"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"訊息編號:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"類別:"</string>
 </resources>
diff --git a/tests/testapp/res/values-zh-rTW/strings.xml b/tests/testapp/res/values-zh-rTW/strings.xml
index c4e24d0..5a0500f 100644
--- a/tests/testapp/res/values-zh-rTW/strings.xml
+++ b/tests/testapp/res/values-zh-rTW/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"區域廣播測試"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"傳送 ETWS 正常廣播"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"傳送 ETWS 取消廣播"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"傳送 ETWS 測試廣播"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"傳送 CMAS 總統級警示"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"傳送 CMAS 極嚴重警示"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"傳送 CMAS 嚴重警示"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"傳送 CMAS 安珀警示"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"傳送 CMAS 每月測試警示"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"傳送 GSM 7 位元測試廣播"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"傳送 UMTS 7 位元測試廣播"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"傳送 GSM 7 位元全長廣播"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"傳送 UMTS 7 位元全長廣播"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"傳送 GSM 7 位元多字碼頁廣播"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"傳送 UMTS 7 位元多字碼頁廣播"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"傳送特定語言的 GSM 7 位元訊息"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"在本文中傳送 GSM 7 位元訊息,附加語言代碼"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"傳送特定語言的 UMTS 7 位元訊息"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"傳送 GSM UCS-2 測試廣播"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"傳送 UMTS UCS-2 測試廣播"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"傳送 UMTS UCS-2 多字碼頁廣播"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"傳送特定語言的 GSM UCS-2 訊息"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"傳送特定語言的 UMTS UCS-2 訊息"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"傳送前延遲 5 秒"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"訊息編號:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"類別:"</string>
+    <string name="app_label" msgid="2704349695846064655">"區域廣播測試"</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>
+    <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_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>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"傳送 CMAS 每月測試警示"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"傳送 GSM 7 位元測試廣播"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"傳送 UMTS 7 位元測試廣播"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"傳送 GSM 7 位元全長廣播"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"傳送 UMTS 7 位元全長廣播"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"傳送 GSM 7 位元多字碼頁廣播"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"傳送 UMTS 7 位元多字碼頁廣播"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"傳送 GSM 7 位元訊息,附加語言代碼"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"在本文中傳送 GSM 7 位元訊息,附加語言代碼"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"傳送 UMTS 7 位元訊息,附加語言代碼"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"傳送 GSM UCS-2 測試廣播"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"傳送 UMTS UCS-2 測試廣播"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"傳送 UMTS UCS-2 多字碼頁廣播"</string>
+    <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">"傳送前延遲 5 秒"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"訊息編號:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"類別:"</string>
 </resources>
diff --git a/tests/testapp/res/values-zu/strings.xml b/tests/testapp/res/values-zu/strings.xml
index 8eb5697..b04e2ef 100644
--- a/tests/testapp/res/values-zu/strings.xml
+++ b/tests/testapp/res/values-zu/strings.xml
@@ -16,30 +16,33 @@
 
 <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="2102435118079140813">"Izivivinyo Zokusakaza kwamaSeli"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Thumela Ukusakaza Okuvamile kwe-ETWS"</string>
-    <string name="button_etws_cancel_type" msgid="7194264116649371175">"Thumela i-ETWS Khansela Ukusakaza"</string>
-    <string name="button_etws_test_type" msgid="6353906188028139901">"Thumela i-ETWS Yokusakaza Imibhalo"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Thumela Isaziso Esiphathelene Nokubusa se-CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Thumela Isaziso Esikhulu Kakhulu se-CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Thumela Isaziso Esikhulu se-CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Thumela isaziso SOMBALA OPHUZI we-CMAS"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Thumela Isaziso Sokuhlola Sanyanga Zonke se-CMAS"</string>
-    <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Thumela Isivivinyo Sohlelo Lomhlaba Lokuxhumana Kwamaselula Ngamabhayithi angu-7"</string>
-    <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Thumela Isivivinyo Sokusakaza Ngamabhayithi angu-7 se-UMTS"</string>
-    <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Thumela Uhlelo Lomhlaba Lokuxhumana Kwamaselula Lokusakaza Olugcwele Olunobude Bamabhayithi angu-7"</string>
-    <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Thumela Ubude Obugcwele Kwamabhayithi angu-7 be-UMTS"</string>
-    <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Thumela ukusakaza Kwamakhasi Amaningana Kohlelo Lomhlaba Lokuxhumana Kwamaselula Ngamabhayithi angu-7"</string>
-    <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Thumela i-UMTS Yokusakaza Amakhasi Amaningana Amabhayithi angu-7"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Thumela Uhlelo Lomhlaba Lokuxhumana Kwamaselula Lwamabhayithi angu-7 Nezi Limi"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">"Thumela i-GSM Yamabhithi angu-7 Ekanye Nolimi Lomzimba"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Thumela i-UMTS Yamabhayithi angu-7 Ngezilimi"</string>
-    <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Thumela Isivivinyo Sokusakaza Sohlelo Lomhlaba Lokuxhumana Kwamaselula e-UCS-2"</string>
-    <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Thumela Isivivinyo Sokusakaza se UMTS UC-2"</string>
-    <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Thumela ukusakaza Kwamakhasi Amaningana e-UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Thumela Uhlelo Lomhlaba Lokuxhumana Kwamaselula lwe-UCS-2 Ngezilimi"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Thumela i-UMTS UCS-2 Ngezilimi"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Yephuza ngamasekhondi angu-5 ngaphambi kokuthumela"</string>
-    <string name="message_id_label" msgid="4365322663037110887">"I-ID yomlayezo:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"Isigaba:"</string>
+    <string name="app_label" msgid="2704349695846064655">"Ukuhlolwa kokusakaza kweselula"</string>
+    <string name="button_etws_earthquake_type" msgid="5391060421937195923">"Thumela ukusakazwa kokuzamazama komhlaba kwe-ETWS"</string>
+    <string name="button_etws_tsunami_type" msgid="5866338269041475786">"Thumela ukusakazwa kwe-ETWS Tsunami"</string>
+    <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"Thumela ukusakazwa kokuzamazama komhlaba kwe-ETWS nokwe-Tsunami"</string>
+    <string name="button_etws_other_type" msgid="4129451610585426791">"Thumela okunye ukusakazwa okuphuthumayo kwe-ETWS"</string>
+    <string name="button_etws_cancel_type" msgid="4770911191572322801">"Thumela ukusakazwa kokukhansela kwe-ETWS"</string>
+    <string name="button_etws_test_type" msgid="5520113823851979673">"Thumela ukusakazwa kokuhlolwa kwe-ETWS"</string>
+    <string name="button_cmas_pres_alert" msgid="1269455100893365889">"Thumela isexwayiso sobumengameli se-CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="5922644977169679386">"Thumela isexwayiso esibucayi se-CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="5197711586353552255">"Thumela isexwayiso ezinzima ze-CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="860091654456014191">"Thumela isexwayiso se-CMAS AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="6797479769988491996">"Thumela isexwayiso sokuhlolwa kwanyanga zonke se-CMAS"</string>
+    <string name="button_gsm_7bit_type" msgid="4902292221458231081">"Thumela ukusakaza kokuhlolwa kwebhithi ye-GSM 7"</string>
+    <string name="button_gsm_7bit_umts_type" msgid="5871195118138691977">"Thumela ukusakaza kokuhlolwa kwebhithi ye-UMTS 7"</string>
+    <string name="button_gsm_7bit_nopadding_type" msgid="5003490670292596214">"Thumela ukusakazwa kobude obugcwele kwebhithi ye-GSM 7"</string>
+    <string name="button_gsm_7bit_nopadding_umts_type" msgid="4581119373426634893">"Thumela ukusakazwa kobude obugcwele kwebhithi ye-UMTS 7"</string>
+    <string name="button_gsm_7bit_multipage_type" msgid="4722261710591475726">"Thumela ukusakazwa kwamakhasi amaningi ebhithi ye-GSM 7"</string>
+    <string name="button_gsm_7bit_multipage_umts_type" msgid="1178053563290345110">"Thumela ukusakazwa kwamakhasi amaningi ebhithi ye-UMTS 7"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="2022040547313986751">"Thumela ibhithi ye-GSM 7 ngolimi"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="9100697687183591382">"Thumela ibhithi ye-GSM 7 ngolimi emzimbeni"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="8483712413017340666">"Thumela ibhithi ye-UMTS 7 ngolimi"</string>
+    <string name="button_gsm_ucs2_type" msgid="6571590740592193686">"Thumela ukuhlolwa kokusakaza kwe-GSM UCS-2"</string>
+    <string name="button_gsm_ucs2_umts_type" msgid="5951592009555548877">"Thumela ukuhlolwa kokusakaza kwe-UMTS UCS2"</string>
+    <string name="button_gsm_ucs2_multipage_umts_type" msgid="5063336859681757254">"Thumela ukusakaza kwamakhasi amaningi kwe-UMTS UCS-2"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="7782847783969114889">"Thumela i-GSM UCS-2 ngolimi"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1722368447645668730">"Thumela i-UMTS UCS-2 ngolimi"</string>
+    <string name="button_delay_broadcast" msgid="751650250579017537">"Libazisa amasekhondi angu-5 ngaphambi kokuthumela"</string>
+    <string name="message_id_label" msgid="1445077194410403236">"I-ID yomlayezo:"</string>
+    <string name="category_id_label" msgid="6935815032327981691">"Isigaba:"</string>
 </resources>
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index 4a86e4e..7940591 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -23,7 +23,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target \
+    mockito-target-minus-junit4 \
     legacy-android-test
 
 # Include all test java files.
@@ -33,5 +33,7 @@
 
 LOCAL_INSTRUMENTATION_FOR := CellBroadcastReceiver
 
+LOCAL_COMPATIBILITY_SUITE := device-tests
+
 include $(BUILD_PACKAGE)
 
diff --git a/tests/unit/AndroidTest.xml b/tests/unit/AndroidTest.xml
new file mode 100644
index 0000000..f85b8c8
--- /dev/null
+++ b/tests/unit/AndroidTest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Run CellBroadcastReceiver Unit Test Cases.">
+    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+        <option name="test-file-name" value="CellBroadcastReceiverUnitTests.apk" />
+    </target_preparer>
+
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-tag" value="CellBroadcastReceiverUnitTests" />
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="com.android.cellbroadcastreceiver.tests.unit" />
+        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+    </test>
+</configuration>