release-request-81b48854-d0e0-49af-bcf2-857273cbb8dc-for-git_oc-mr1-release-4306444 snap-temp-L17300000097872583

Change-Id: I8ba72c64bdcdc374ed47ea687824fff1381a6b80
author: android-build-team Robot <android-build-team-robot@google.com> 2017-08-30 07:31:24 +0000
committer: android-build-team Robot <android-build-team-robot@google.com> 2017-08-30 07:31:24 +0000
commit: cd877cc278dd95f62e04c3ea64c62efe18edf86d (patch)
tree: 32ee22ae72237c3f7ba86fd7693d4a622560c615
parent: aad38496d0a2b1ac334828e0eb383133ebf1a14c (diff)
parent: ba81e4f1fe5d243b3eb9c75dda21c2518bead06d (diff)
download: android_packages_apps_CellBroadcastReceiver-cd877cc278dd95f62e04c3ea64c62efe18edf86d.tar.gz
android_packages_apps_CellBroadcastReceiver-cd877cc278dd95f62e04c3ea64c62efe18edf86d.tar.bz2
android_packages_apps_CellBroadcastReceiver-cd877cc278dd95f62e04c3ea64c62efe18edf86d.zip
48 files changed, 299 insertions, 109 deletions
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 686201de..4f0a41ba 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"Noodwaarskuwings"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Seluitsending-instellings is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Daar is geen aktiewe berigte in jou area nie. Jy kan die Berigte-instellings verander in die Instellings-kieslysopsie."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Daar is geen aktiewe opletberigte in jou area nie. Jy kan die Opletberigte-instellings verander in die Instellings-kieslysopsie."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Instellings"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Vee uitsendings uit"</string>
     <string name="message_options" msgid="3178489901903589574">"Boodskapopsies"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 574d8d34..f249589f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -19,8 +19,8 @@
     <string name="app_label" msgid="7559008249836700599">"Cell Broadcasts"</string>
     <string name="sms_cb_settings" msgid="3795852619005211509">"تنبيهات الطوارئ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"إعدادات البث الخلوي غير متوفّرة لهذا المستخدم"</string>
-    <string name="button_dismiss" msgid="1234221657930516287">"موافق"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"لا تتوفر اشعارات نشطة في منطقتك. يمكنك تغيير إعدادات التنبيه باستخدام خيار قائمة الإعدادات."</string>
+    <string name="button_dismiss" msgid="1234221657930516287">"حسنًا"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"لا تتوفّر إشعارات نشطة في منطقتك. يمكنك تغيير إعدادات التنبيه باستخدام خيار قائمة الإعدادات."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"الإعدادات"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"حذف مجموعات البث"</string>
     <string name="message_options" msgid="3178489901903589574">"خيارات الرسائل"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 14f13a4d..ea7b9a3b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -59,7 +59,7 @@
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Надзвычайныя пагрозы"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Надзвычайныя пагрозы для жыцця і маёмасці"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Сур\'ёзныя пагрозы"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Сур\'ёзная пагрозы для жыцця і маёмасці"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Сур\'ёзныя пагрозы для жыцця і маёмасці"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Абвесткі сістэмы AMBER"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Апавяшчэнні пра выкраданне дзяцей"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Тэставыя рассылкі CMAS"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index bc3d6b95..00f32c1e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -49,10 +49,10 @@
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Съобщения за излъчване"</string>
     <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Разрешаване на сигналите"</string>
     <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Получаване на известия при спешни случаи"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Напомняния за сигнали: Звук"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Звук за напомняния за сигнали"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Съобщ. за сигнала: Изговаряне"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Използване на синтезиран говор за съобщенията за сигнали при спешни случаи"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Сигнали при спешни случаи: История"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"История на сигнали при спешни случаи"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Предпочитания за сигналите"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Тестови излъчвания за СПЗЦ"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Тестови излъчвания за системата за предупреждение за земетресения и цунами"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 570acfdb..e8e39122 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -69,7 +69,7 @@
     <string name="use_full_volume_summary" msgid="3560764277281704697">"ডু নট ডিস্টার্ব এবং ভলিউমের অন্যান্য পছন্দগুলি অগ্রাহ্য করুন"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"জায়গার আপডেটের সম্প্রচার"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"সিম স্ট্যাটাসে আপডেটের তথ্য দেখুন"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"বিকাশকারী বিকল্পগুলি"</string>
+    <string name="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,7 +104,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>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 9d5262f6..e26e2c6d 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Info servis"</string>
-    <string name="sms_cb_settings" msgid="3795852619005211509">"Upozorenja na hitne slučajeve"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Hitna upozorenja"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Postavke info servisa nisu dostupne ovom korisniku"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Uredu"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nema aktivnih upozorenja u vašem području. Možete promijeniti postavke upozorenja pomoću opcija u meniju Postavke."</string>
@@ -60,7 +60,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Izrazita opasnost po život i imovinu"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Velika opasnost"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Velika opasnost po život i imovinu"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"NARANDŽASTA upozorenja"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER upozorenja"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bilteni hitnih obavještenja kod otmice djeteta"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS probna emitiranja"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Probna emitiranja za komercijalni sistem za upozorenja na mobilnim uređajima"</string>
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Trenutno primate upozorenja o vanrednim situacijama. Želite li ih primati i dalje?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Da"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ne"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Historija hitnih alarma"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Historija poruka upozorenja"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jednom"</item>
     <item msgid="9097229303902157183">"Svake 2 minute"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 70d47bcb..317c6ba8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"Nødalarmer"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Denne bruger har ikke adgang til indstillingerne for Cell Broadcast"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Der er ingen aktive advarsler i dit område. Du kan ændre indstillingerne for advarslen ved hjælp af menuen Indstillinger."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Der er ingen aktive advarsler i dit område. Du kan ændre indstillingerne for advarsler i menuen Indstillinger."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Indstillinger"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Slet meddelelser"</string>
     <string name="message_options" msgid="3178489901903589574">"Valgmuligheder for beskeder"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b7c61beb..6139c71c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -60,7 +60,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreme Gefahren für Leben und Eigentum"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Erhebliche Gefahren"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Erhebliche Gefahren für Leben und Eigentum"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-Benachrichtigungen"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER Alerts"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Notfallbulletins zu Kindesentführung"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-Testnachrichten"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testnachrichten für Commercial Mobile Alert System"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 00000000..1b4cf081
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,120 @@
+<?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">"Mobile broadcasts"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Emergency alerts"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Mobile broadcast settings are not available for this user"</string>
+    <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"There are no active alerts in your area. You can change the Alert settings using the Settings menu option."</string>
+    <string name="menu_preferences" msgid="3596514894131599202">"Settings"</string>
+    <string name="menu_delete_all" msgid="3940997343921149800">"Delete broadcasts"</string>
+    <string name="message_options" msgid="3178489901903589574">"Message options"</string>
+    <string name="menu_view_details" msgid="1040989019045280975">"View details"</string>
+    <string name="menu_delete" msgid="128380070910799366">"Delete broadcast"</string>
+    <string name="view_details_title" msgid="1780427629491781473">"Alert details"</string>
+    <string name="confirm_delete_broadcast" msgid="2540199303730232322">"Delete this broadcast?"</string>
+    <string name="confirm_delete_all_broadcasts" msgid="2924444089047280871">"Delete all received broadcast messages?"</string>
+    <string name="button_delete" msgid="4672451757925194350">"Delete"</string>
+    <string name="button_cancel" msgid="7479958360523246140">"Cancel"</string>
+    <string name="etws_earthquake_warning" msgid="6428741104423152511">"Earthquake warning"</string>
+    <string name="etws_tsunami_warning" msgid="6173964105145900312">"Tsunami warning"</string>
+    <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Earthquake and tsunami warning"</string>
+    <string name="etws_test_message" msgid="8447820262584381894">"ETWS test message"</string>
+    <string name="etws_other_emergency_type" msgid="5233080551309721499">"Emergency warning"</string>
+    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Presidential alert"</string>
+    <string name="cmas_extreme_alert" msgid="2588720613319969289">"Emergency alert: Extreme"</string>
+    <string name="cmas_severe_alert" msgid="4135809475315826913">"Emergency alert: Severe"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"Child abduction (Amber alert)"</string>
+    <string name="cmas_required_monthly_test" msgid="6464047268150108932">"Emergency alert monthly test"</string>
+    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Emergency alert (exercise)"</string>
+    <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Emergency alert (operator)"</string>
+    <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Emergency alert"</string>
+    <string name="cb_other_message_identifiers" msgid="5790068194529377210">"Broadcast messages"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"Alerts"</string>
+    <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Broadcast messages"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Allow alerts"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Receive emergency notifications"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Alert reminder sound"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Speak alert message"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Use text-to-speech to speak emergency alert messages"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Emergency alert history"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"Alert preferences"</string>
+    <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS test broadcasts"</string>
+    <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Test broadcasts for Earthquake Tsunami Warning System"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extreme threats"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreme threats to life and property"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Severe threats"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Severe threats to life and property"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER alerts"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Child abduction emergency bulletins"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS test broadcasts"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Test broadcasts for Commercial Mobile Alert System"</string>
+    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrate"</string>
+    <string name="use_full_volume_title" msgid="8581439612945182255">"Use full volume"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"Ignore other volume and do not disturb preferences"</string>
+    <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Area update broadcasts"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Show update information in SIM status"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Developer options"</string>
+    <string name="cmas_category_heading" msgid="3923503130776640717">"Alert Category:"</string>
+    <string name="cmas_category_geo" msgid="4979494217069688527">"Geophysical"</string>
+    <string name="cmas_category_met" msgid="7563732573851773537">"Meteorological"</string>
+    <string name="cmas_category_safety" msgid="2986472639641883453">"Safety"</string>
+    <string name="cmas_category_security" msgid="2549520159044403704">"Security"</string>
+    <string name="cmas_category_rescue" msgid="4907571719983321086">"Rescue"</string>
+    <string name="cmas_category_fire" msgid="3331981591918341119">"Fire"</string>
+    <string name="cmas_category_health" msgid="312569774587117324">"Health"</string>
+    <string name="cmas_category_env" msgid="9213088574227522961">"Environmental"</string>
+    <string name="cmas_category_transport" msgid="5014901635987361642">"Transportation"</string>
+    <string name="cmas_category_infra" msgid="3558151044446851398">"Infrastructure"</string>
+    <string name="cmas_category_cbrne" msgid="240421557913603971">"Chemical/Biological/Nuclear/Explosive"</string>
+    <string name="cmas_category_other" msgid="6158932360790744360">"Other"</string>
+    <string name="cmas_response_heading" msgid="4205379547245540163">"Response Type:"</string>
+    <string name="cmas_response_shelter" msgid="7301175579079615909">"Shelter"</string>
+    <string name="cmas_response_evacuate" msgid="5833170084430021095">"Evacuate"</string>
+    <string name="cmas_response_prepare" msgid="8428073909753758319">"Prepare"</string>
+    <string name="cmas_response_execute" msgid="284719420769568493">"Execute"</string>
+    <string name="cmas_response_monitor" msgid="681400164440495749">"Monitor"</string>
+    <string name="cmas_response_avoid" msgid="156419597612629270">"Avoid"</string>
+    <string name="cmas_response_assess" msgid="9043534222710563415">"Assess"</string>
+    <string name="cmas_response_none" msgid="5149009359674452959">"None"</string>
+    <string name="cmas_severity_heading" msgid="8437057117822305243">"Severity:"</string>
+    <string name="cmas_severity_extreme" msgid="1312013282860183082">"Extreme"</string>
+    <string name="cmas_severity_severe" msgid="7504359209737074524">"Severe"</string>
+    <string name="cmas_urgency_heading" msgid="8218282767913431492">"Urgency:"</string>
+    <string name="cmas_urgency_immediate" msgid="1577485208196449288">"Immediate"</string>
+    <string name="cmas_urgency_expected" msgid="6830831119872375936">"Expected"</string>
+    <string name="cmas_certainty_heading" msgid="8374669249736439193">"Certainty:"</string>
+    <string name="cmas_certainty_observed" msgid="3668549749352106472">"Observed"</string>
+    <string name="cmas_certainty_likely" msgid="4254497828943291749">"Likely"</string>
+    <string name="delivery_time_heading" msgid="5980836543433619329">"Received:"</string>
+    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> unread alerts."</string>
+    <string name="notification_multiple_title" msgid="1523638925739947855">"New alerts"</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Show an opt-out dialogue after displaying the first CMAS alert (other than Presidential Alert)."</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Show opt-out dialogue"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"You are currently receiving Emergency Alerts. Would you like to continue receiving Emergency Alerts?"</string>
+    <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Yes"</string>
+    <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"No"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Emergency alert history"</string>
+  <string-array name="alert_reminder_interval_entries">
+    <item msgid="6595211083588795160">"Once"</item>
+    <item msgid="9097229303902157183">"Every 2 minutes"</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 e77d771c..32b0b1d8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -56,10 +56,10 @@
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de alertas"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Emisiones de prueba del ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Emisiones de prueba del Sistema de alerta de terremotos y tsunamis"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Amenazas serias"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Amenazas serias para la vida y la propiedad"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Amenazas extremas"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Amenazas extremas contra la vida y la propiedad"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Amenazas graves"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Amenazas graves a la vida y la propiedad"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Amenazas graves contra la vida y la propiedad"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas AMBER"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Boletines de emergencia sobre secuestro de menores"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Emisiones de prueba del CMAS"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f74c8fd4..36ef9cda 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -52,7 +52,7 @@
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Sonido recordatorio de alertas"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Decir mensaje de alerta"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Utilizar síntesis de voz para los mensajes de alerta de emergencia"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial alertas emergencia"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial de alertas de emergencia"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de las alertas"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Difusiones de prueba del ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Difusiones de prueba del sistema de alerta de tsunami y terremoto"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e6813099..33f705b3 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"Hädaolukorra teatised"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Kärjeteate seaded pole sellele kasutajale saadaval"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Teie piirkonnas ei ole aktiivseid häireid. Võite häirete seadeid muuta menüüvalikus Seaded."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Teie piirkonnas ei ole aktiivseid häireid. Võite teatiste seadeid muuta menüüvalikus Seaded."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Seaded"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Kustuta saated"</string>
     <string name="message_options" msgid="3178489901903589574">"Sõnumite valikud"</string>
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Praegu on hädaolukorra märguannete saamine kasutusel. Kas soovite hädaolukorra märguandeid jätkuvalt saada?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Jah"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ei"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Hädaolukorra märguannete ajalugu"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Hädaolukorra teatiste ajalugu"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Üks kord"</item>
     <item msgid="9097229303902157183">"Iga 2 minuti järel"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index c60bf7a5..ed3c72ef 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"Larrialdi-abisuak"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Erabiltzaile honek ez dauzka erabilgarri igorpen zelularraren ezarpenak"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Ados"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Ez dago alerta aktiborik zure inguruan. Alerten ezarpenak alda ditzakezu Ezarpenak menuko aukera erabilita."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Ez dago abisu aktiborik zure inguruan. Abisuen ezarpenak aldatzeko, zoaz Ezarpenak menuko aukerara."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Ezarpenak"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Ezabatu igorpenak"</string>
     <string name="message_options" msgid="3178489901903589574">"Mezuaren aukerak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 2156c2a6..dffcb925 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -58,7 +58,7 @@
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"پخش‌های آزمایشی برای سیستم هشدار سونامی زلزله"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"تهدیدهای بسیار جدی"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"تهدیدهای بسیار جدی جانی و مالی"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"تهدیدهای بسیار جدی"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"تهدیدهای جدی"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"تهدیدهای جدی جانی و مالی"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏هشدارهای AMBER"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"بولتن‌های اضطراری کودک‌ربایی"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 182cac30..e1b17fd8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -57,9 +57,9 @@
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Diffusions test ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Diffusions test du système d\'avertissement pour tremblements de terre et tsunamis"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Menaces extrêmes"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Menaces extrêmes pour la vie humaine et les biens"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Menaces extrêmes pour les biens et personnes"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Menaces graves"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Menaces graves pour la vie humaine et les biens"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Menaces graves pour les biens et personnes"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertes Enlèvement"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bulletins d\'urgence relatifs aux enlèvements d\'enfants"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Diffusions test pour le CMAS"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index b60ac592..c03f171c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -52,7 +52,7 @@
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Son do recordatorio de alerta"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ler mensaxe de alerta"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Usar síntese de voz para ler as mensaxes de alertas de emerxencia"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial alertas emerxencia"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historial de alertas de emerxencia"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferencias de alertas"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Emisións de proba do ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Emisións de proba do sistema de avisos de terremotos e tsunamis (ETWS)"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4b67d95e..f20536f6 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/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">"सेल ब्रॉडकास्ट (CBC)"</string>
     <string name="sms_cb_settings" msgid="3795852619005211509">"आपातकालीन सूचनाएं"</string>
-    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"सेल प्रसारण सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"सेल ब्रॉडकास्ट (CBC) सेटिंग इस उपयोगकर्ता के लिए मौजूद नहीं हैं"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ठीक है"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"आपके क्षेत्र में कोई सक्रिय अलर्ट नहीं है. आप सेटिंग मेनू विकल्‍प का उपयोग करके अलर्ट सेटिंग बदल सकते हैं."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"आपके इलाके में कोई सक्रिय अलर्ट नहीं है. आप सेटिंग मेन्यू विकल्‍प का इस्तेमाल करके अलर्ट सेटिंग बदल सकते हैं."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"सेटिंग"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"प्रसारण हटाएं"</string>
     <string name="message_options" msgid="3178489901903589574">"संदेश विकल्‍प"</string>
@@ -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>
@@ -48,7 +48,7 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"सूचनाएं"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"प्रसारण संदेश"</string>
     <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"सूचनाओं को अनुमति दें"</string>
-    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"आपातकालीन नोटिफ़िकेशन पाएं"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"आपातकालीन सूचना पाएं"</string>
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"सूचना रिमाइंडर की ध्वनि"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"अलर्ट संदेश बोलें"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"आपातकालीन अलर्ट संदेश बोलने के लिए लेख-से-बोली का उपयोग करें"</string>
@@ -64,12 +64,12 @@
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"बच्‍चे के अपहरण का आपातकालीन बुलेटिन"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS परीक्षण प्रसारण"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"व्यावसायिक मोबाइल सूचना सिस्‍टम के लिए परीक्षण प्रसारण"</string>
-    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंपन"</string>
+    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंपन (वाइब्रेशन)"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"पूरे वॉल्यूम का उपयोग करें"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"अन्य वॉल्यूम और परेशान न करें प्राथमिकताओं को अनदेखा करें"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"क्षेत्र अपडेट प्रसारण"</string>
-    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM स्थिति में अपडेट जानकारी दिखाएं"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"डेवलपर विकल्प"</string>
+    <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"सिम की स्थिति में बदलाव की जानकारी दिखाएं"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"डेवलपर के लिए सेटिंग और टूल"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"अलर्ट श्रेणी:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"भूभौतिकीय"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"मौसम संबंधी"</string>
@@ -99,7 +99,7 @@
     <string name="cmas_urgency_immediate" msgid="1577485208196449288">"तुरंत"</string>
     <string name="cmas_urgency_expected" msgid="6830831119872375936">"अपेक्षित"</string>
     <string name="cmas_certainty_heading" msgid="8374669249736439193">"निश्चितता:"</string>
-    <string name="cmas_certainty_observed" msgid="3668549749352106472">"अवलोकन किया गया"</string>
+    <string name="cmas_certainty_observed" msgid="3668549749352106472">"देखा गया"</string>
     <string name="cmas_certainty_likely" msgid="4254497828943291749">"संभावना"</string>
     <string name="delivery_time_heading" msgid="5980836543433619329">"प्राप्त:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> बिना पढ़े अलर्ट."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1f950974..f321eb5d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -66,7 +66,7 @@
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Probna emitiranja komercijalnog sustava mobilnog upozoravanja"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibracija"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"Koristi punu glasnoću"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemari druge postavke glasnoće i značajke Ne uznemiravaj"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"Zanemari druge postavke glasnoće i značajke Ne ometaj"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Emitiranja obavijesti za područje"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Prikaži informacije o obavijestima u statusu SIM-a"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcije za razvojne programere"</string>
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Trenutačno primate Hitna upozorenja. Želite li ih primati i dalje?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Da"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ne"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Povijest upozorenja o hitnim slučajevima"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Upozorenja o hitnim slučajevima"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Jedanput"</item>
     <item msgid="9097229303902157183">"Svake 2 minute"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 7adb77e3..2b49bfbc 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -49,7 +49,7 @@
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Հեռարձակման հաղորդագրություններ"</string>
     <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Թույլատրել ահազանգերը"</string>
     <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Ստանալ արտակարգ իրավիճակների ծանուցումներ"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Ծանուցումների հիշեցումների ձայն"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Հիշեցման ձայնը"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Բարձրաձայնել զգուշացումը"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Օգտագործել տեքստից-խոսքը՝ արտակարգ նախազգուշական հաղորդագրությունները բարձրաձայնելու համար"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Արտակարգ իրավիճակների արխիվ"</string>
@@ -57,11 +57,11 @@
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS փորձնական հեռարձակումներ"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Փորձնական հեռարձակումներ երկրաշարժի և ցունամիի նախազգուշացնող համակարգի համար"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Կարևոր ահազանգեր"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Կյանքին և սեփականությանը սպառնացող կարևոր ահազանգեր"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ծայրահեղ սպառնալիքներ կյանքի և գույքի համար"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Կարևոր ահազանգեր"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Կյանքին և սեփականությանը սպառնացող չափազանց կարևոր ահազանգեր"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Լուրջ սպառնալիքներ կյանքի և գույքի համար"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER ծանուցումներ"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Երեխայի առևանգման արտակարգ իրավիճակների տեղեկագրեր"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Հաղորդումներ երեխաների առևանգման մասին"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS փորձնական հեռարձակումներ"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Փորձնական հեռարձակումներ բջջային գովազդային ահազանգերի համակարգի համար"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Թրթռոց"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index daffec55..d8765f06 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Saat ini Anda menerima Lansiran Darurat. Apakah Anda ingin terus menerima Lansiran Darurat?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ya"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Tidak"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Riwayat notifikasi darurat"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Histori notifikasi darurat"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Satu kali"</item>
     <item msgid="9097229303902157183">"Setiap 2 menit"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b7681c78..814f18df 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -115,6 +115,6 @@
     <item msgid="9097229303902157183">"Ogni 2 minuti"</item>
     <item msgid="5718214950343391480">"Ogni 5 minuti"</item>
     <item msgid="3863339891188103437">"Ogni 15 minuti"</item>
-    <item msgid="6868848414437854609">"Disattivati"</item>
+    <item msgid="6868848414437854609">"Disattivato"</item>
   </string-array>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c2bfa4b7..d10cc271 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"שידורים סלולריים"</string>
-    <string name="sms_cb_settings" msgid="3795852619005211509">"התראות חירום"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"התרעות חירום"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"הגדרות של שידור סלולרי אינן זמינות עבור המשתמש הזה"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"אישור"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"אין התרעות פעילות באזור שלך. ניתן לשנות את ההגדרות של \'התרעה\' דרך תפריט \'הגדרות\'."</string>
@@ -45,22 +45,22 @@
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"התרעת חירום (מפעיל)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"התרעת חירום"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"הודעות שידור"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"התראות"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"התרעות"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"הודעות שידור"</string>
-    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"הצגת התראות"</string>
-    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"אני רוצה לקבל התראות חירום"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"הצליל של תזכורות ההתראה"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"הצגת התרעות"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"אני רוצה לקבל התרעות חירום"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"הצליל של תזכורות ההתרעה"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"הודעת התרעה תושמע בקול"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"השתמש בטקסט לדיבור כדי להגיד בקול הודעות של התרעת חירום"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"היסטוריה של התראות חירום"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"העדפות התראה"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"היסטוריה של התרעות חירום"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"העדפות התרעה"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"‏שידורי בדיקה של ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"שידורי בדיקה של מערכת ההתראות על צונאמי ורעידות אדמה"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"איומים קיצוניים"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"איומים קיצוניים לנפש ולרכוש"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"איומים חמורים"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"איומים חמורים לנפש ולרכוש"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏התראות AMBER"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"‏התרעות AMBER"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"מבזקי חירום על חטיפת ילדים"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"‏שידורי בדיקה של CMAS"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"‏שידורי בדיקה של Commercial Mobile Alert System"</string>
@@ -102,14 +102,14 @@
     <string name="cmas_certainty_observed" msgid="3668549749352106472">"נצפתה"</string>
     <string name="cmas_certainty_likely" msgid="4254497828943291749">"סבירה"</string>
     <string name="delivery_time_heading" msgid="5980836543433619329">"התקבלה:"</string>
-    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> התראות שלא נקראו."</string>
-    <string name="notification_multiple_title" msgid="1523638925739947855">"התראות חדשות"</string>
+    <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> התרעות שלא נקראו."</string>
+    <string name="notification_multiple_title" msgid="1523638925739947855">"התרעות חדשות"</string>
     <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"‏הצג תיבת דו שיח לביטול הסכמה לאחר הצגת התרעת CMAS הראשונה (מלבד התרעה נשיאותית)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"הצג תיבת דו שיח לביטול הסכמה"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"נכון לעכשיו אתה מקבל התראות חירום. האם ברצונך להמשיך לקבל התראות חירום?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"נכון לעכשיו אתה מקבל התרעות חירום. האם ברצונך להמשיך לקבל התרעות חירום?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"כן"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"לא"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"היסטוריה של התראות חירום"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"היסטוריה של התרעות חירום"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"פעם אחת"</item>
     <item msgid="9097229303902157183">"כל שתי דקות"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 59cf90f3..53c0d94f 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -112,7 +112,7 @@
     <string name="cb_list_activity_title" msgid="1433502151877791724">"საგანგებო გაფრთხილებათა ისტორია"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ერთხელ"</item>
-    <item msgid="9097229303902157183">"ყოველ 2 წუთში ერთხელ"</item>
+    <item msgid="9097229303902157183">"ყოველ 2 წუთში"</item>
     <item msgid="5718214950343391480">"ყოველ 5 წუთში"</item>
     <item msgid="3863339891188103437">"ყოველ 15 წუთში"</item>
     <item msgid="6868848414437854609">"გამორთული"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index aea751a8..1c75597e 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"Төтенше хабарламалар"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Ұялы таратылым параметрлері осы пайдаланушы үшін қол жетімді емес"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"Жарайды"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Сіздің аймағыңызда белсенді дабылдар жоқ. Дабыл параметрлерін «Параметрлер» мәзір опциясы арқылы өзгертуге болады."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Сіздің аймағыңызда белсенді хабарламалар жоқ. Хабарлама параметрлерін «Параметрлер» мәзір опциясы арқылы өзгертуге болады."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Параметрлер"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Таратылымдарды жою"</string>
     <string name="message_options" msgid="3178489901903589574">"Хабар опциялары"</string>
@@ -60,7 +60,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Өмірге және мүлікке төнген үлкен қауіптер"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ауыр қауіптер"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Өмірге және мүлікке төнген ауыр қауіптер"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"САРЫ хабарламалар"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER хабарламалары"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Бала ұрлау туралы төтенше бюллетеньдер"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS сынақ таратылымдары"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Commercial Mobile Alert System жүйесі үшін сынақ таратылымдарын көрсету"</string>
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Сіз қазір төтенше дабылдарды қабылдап жатырсыз. Төтенше дабылдар қабылдауды жалғастырғыңыз келе ме?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Иә"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Жоқ"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Төтенше дабыл тарихы"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Төтенше хабарлама тарихы"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Бір рет"</item>
     <item msgid="9097229303902157183">"2 минут сайын"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index f94fc283..682a3612 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -60,7 +60,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ការគំរាមកំហែងដល់អាយុជីវិត និងទ្រព្យសម្បត្តិដ៏ធ្ងន់ធ្ងរបំផុត"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ការគំរាមកំហែងធ្ងន់ធ្ងរ"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ការគំរាមកំហែងដល់អាយុជីវិត និងទ្រព្យសម្បត្តិដ៏ធ្ងន់ធ្ងរ"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"ការជូនដំណឹង AMBER"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"ការជូនដំណឹងពណ៌លឿង"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"ព្រឹត្តិបត្រអាសន្នអំពីការចាប់ជំរិតក្មេង"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"ការផ្សាយសាកល្បងរបស់ CMAS"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"ការផ្សាយសាកល្បងសម្រាប់ Commercial Mobile Alert System"</string>
@@ -109,10 +109,10 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"បច្ចុប្បន្នអ្នកកំពុងទទួលការជូនដំណឹងពេលអាសន្ន។ តើអ្នកចង់បន្តទទួលការជូនដំណឹងពេលអាសន្នដែរឬទេ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"បាទ/ចាស"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"ទេ"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"ប្រវត្តិដាស់តឿនពេលអាសន្ន"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"ប្រវត្តិការជូនដំណឹងពេលអាសន្ន"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"ម្ដង"</item>
-    <item msgid="9097229303902157183">"រៀងរាល់ ២ នាទី"</item>
+    <item msgid="9097229303902157183">"រាល់ 2 នាទីម្តង"</item>
     <item msgid="5718214950343391480">"រាល់ 5 នាទីម្ដង"</item>
     <item msgid="3863339891188103437">"រាល់ 15 នាទីម្តង"</item>
     <item msgid="6868848414437854609">"បិទ"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bcf7a470..abf253c9 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -52,7 +52,7 @@
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"경보 알림음"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"경고 메시지를 음성 언어로 표시"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"비상사태 경고 메시지를 TTS 기능을 사용하여 음성 언어로 알림"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"비상 경보 내역"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"긴급 경보 내역"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"경보 환경설정"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS 테스트 브로드캐스트"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"지진 해일 경보 시스템용 테스트 브로드캐스트"</string>
@@ -106,10 +106,10 @@
     <string name="notification_multiple_title" msgid="1523638925739947855">"새 경보"</string>
     <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"대통령령 경보가 아닌 첫 번째 CMAS(민간 이동통신 경보체계) 알림을 표시한 뒤에 선택 해제 대화상자를 표시합니다."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"선택 해제 대화상자 표시"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"현재 긴급 알림을 수신하고 있습니다. 긴급 알림을 계속 수신하시겠습니까?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"현재 긴급 경보를 수신하고 있습니다. 긴급 경보를 계속 수신하시겠습니까?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"예"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"아니요"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"비상사태 경고 기록"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"긴급 경보 내역"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"한 번"</item>
     <item msgid="9097229303902157183">"2분마다"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2ff1e2ac..05c02761 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Šiuo metu gaunate pagalbos įspėjimus. Ar norite toliau gauti pagalbos įspėjimus?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Taip"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Ne"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Nepaprastosios padėties įspėjimų istorija"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Nepaprastosios padėties įspėjimų ist."</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"Kartą"</item>
     <item msgid="9097229303902157183">"Kas 2 min."</item>
diff --git a/res/values-mcc246-en-rCA/strings.xml b/res/values-mcc246-en-rCA/strings.xml
new file mode 100644
index 00000000..8fc7754c
--- /dev/null
+++ b/res/values-mcc246-en-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-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-zh-rTW/strings.xml b/res/values-mcc246-zh-rTW/strings.xml
index b6c08a4c..b1237615 100644
--- a/res/values-mcc246-zh-rTW/strings.xml
+++ b/res/values-mcc246-zh-rTW/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-第 2 級警報"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-第 3 級警報"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-安珀警報"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="7485388692049524195">"LT-第 2 級警示"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="1140833576401868336">"LT-第 3 級警示"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="4890124669673498133">"LT-安珀警示"</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index de34c117..6ffa646d 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"അടിയന്തര അലേർട്ടുകൾ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ഈ ഉപയോക്താവിനായി സെൽ പ്രക്ഷേപണ ക്രമീകരണങ്ങൾ ലഭ്യമല്ല"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ശരി"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"നിങ്ങളുടെ ഏരിയയിൽ സജീവ അലേർട്ടുകളൊന്നുമില്ല. ക്രമീകരണങ്ങളുടെ മെനു ഓപ്‌ഷൻ ഉപയോഗിച്ച് അലേർട്ട് ക്രമീകരണങ്ങൾ നിങ്ങൾക്ക് മാറ്റാനാകും."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"നിങ്ങളുടെ ഏരിയയിൽ സജീവ അലേർട്ടുകളൊന്നുമില്ല. ക്രമീകരണമെനു ഉപയോഗിച്ച് അലേർട്ട് ക്രമീകരണങ്ങളില്‍ മാറ്റം വരുത്താം"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ക്രമീകരണം"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"പ്രക്ഷേപണങ്ങൾ ഇല്ലാതാക്കുക"</string>
     <string name="message_options" msgid="3178489901903589574">"സന്ദേശ ഓപ്‌ഷനുകൾ"</string>
@@ -59,7 +59,7 @@
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"അതീവ ഗുരുതരമായ ഭീഷണികൾ"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"ജീവനും സ്വത്തിനും നേരെയുള്ള അത്യന്തം ഗുരുതരമായ ഭീഷണികൾ"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"ഗുരുതരമായ ഭീഷണികൾ"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ജീവനും സ്വത്തിനും എതിരായുള്ള ഗുരുതരമായ ഭീഷണികൾ"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"ജീവനും സ്വത്തിനും നേരെയുള്ള ഗുരുതരമായ ഭീഷണികൾ"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER അലേർട്ടുകൾ"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"കുട്ടികളെ അപഹരിക്കലുമായി ബന്ധപ്പെട്ട അടിയന്തര ബുള്ളറ്റിനുകൾ"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS പരീക്ഷണ പ്രക്ഷേപണങ്ങൾ"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 146870e7..32f21a0a 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -64,12 +64,12 @@
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"बाल अपहरण आणीबाणी बुलेटिन"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS चाचणी प्रसारणे"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"व्यावसायिक मोबाईल सूचना सिस्टमसाठी चाचणी प्रसारणे"</string>
-    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंपन होणे"</string>
+    <string name="enable_alert_vibrate_title" msgid="982817538757982090">"कंप पावणे"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"पूर्ण व्‍हॉल्‍यूम वापरा"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"अन्‍य व्‍हॉल्‍यूम आणि व्‍यत्‍यय आणू नका प्राधान्‍यांकडे दुर्लक्ष करा"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"परिसराशी संबंधित अपडेट ब्रॉडकास्ट"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"सिमच्‍या स्थितीत अपडेटची काही माहिती असल्‍यास दाखवा"</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>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 4dcf1634..19e2d754 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"အရေးပေါ်သတိပေးချက်များ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ဆဲလ် ထုတ်လွှင့်မှု ဆက်တင်များကို ဤအသုံးပြုသူ မရယူနိုင်"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"အိုကေ"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"သင်၏ဒေသတွင် လိုက်နာရမည့် သတိပေးချက်များ မရှိပါ။ ဆက်တင်များမီနူးတွင် သတိပေးချက်ဆက်တင်များကို ပြောင်းနိုင်ပါသည်။"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"သင်၏ဒေသတွင် အရေးပေါ် သတိပေးချက်များ မရှိပါ။ ဆက်တင်များမီနူးတွင် သတိပေးချက်ဆက်တင်များကို ပြောင်းနိုင်ပါသည်။"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ဆက်တင်များ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ထုတ်လွှင့်မှုများကို ဖျက်ပါ"</string>
     <string name="message_options" msgid="3178489901903589574">"စာတို ရွေးစရာများ"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index d757c268..4cd4a66e 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -32,7 +32,7 @@
     <string name="button_delete" msgid="4672451757925194350">"मेटाउनुहोस्"</string>
     <string name="button_cancel" msgid="7479958360523246140">"रद्द गर्नुहोस्"</string>
     <string name="etws_earthquake_warning" msgid="6428741104423152511">"भूकम्प बारे सतर्कता"</string>
-    <string name="etws_tsunami_warning" msgid="6173964105145900312">"सुनामी बारे चेतावनी"</string>
+    <string name="etws_tsunami_warning" msgid="6173964105145900312">"सुनामीको चेतावनी"</string>
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"भूकम्प र सुनामी बारे सतर्कता"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"ETWS परीक्षण सन्देश"</string>
     <string name="etws_other_emergency_type" msgid="5233080551309721499">"आपतकालीन चेतावनी"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 91cc0a8c..cf75a96e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -57,10 +57,10 @@
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS-testberichten"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Testberichten van het waarschuwingssysteem voor tsunami\'s en aardbevingen"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Extreme dreigingen"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreme dreigingen voor levens en eigendommen"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Extreem gevaar voor levens en eigendommen"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ernstige dreigingen"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ernstige dreigingen voor levens en eigendommen"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER-alerts"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ernstig gevaar voor levens en eigendommen"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER Alerts"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Noodberichten over ontvoering van kinderen"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS-testberichten"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testberichten voor CMAS (Commercial Mobile Alert System)"</string>
@@ -69,7 +69,7 @@
     <string name="use_full_volume_summary" msgid="3560764277281704697">"Andere voorkeuren voor volume en \'Niet storen\' negeren"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"Broadcasts met lokale informatie"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"Updategegevens weergeven in simkaartstatus"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Opties voor ontwikkelaars"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Ontwikkelaarsopties"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Meldingscategorie:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofysisch"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorologisch"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index cf16d7d1..22f4af25 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"ਸੰਕਟਕਾਲੀਨ ਸੁਚੇਤਨਾਵਾਂ"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"ਸੈਲ ਪ੍ਰਸਾਰਨ ਸੈਟਿੰਗਾਂ ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"ਠੀਕ"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"ਤੁਹਾਡੇ ਖੇਤਰ ਵਿੱਚ ਕੋਈ ਸਰਗਰਮ ਚੇਤਾਵਨੀਆਂ ਨਹੀਂ ਹਨ। ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ ਮੀਨੂ ਵਿਕਲਪ ਵਰਤਦੇ ਹੋਏ ਚੇਤਾਵਨੀ ਸੈਟਿੰਗਾਂ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"ਤੁਹਾਡੇ ਖੇਤਰ ਵਿੱਚ ਕੋਈ ਸਰਗਰਮ ਚਿਤਾਵਨੀਆਂ ਨਹੀਂ ਹਨ। ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ ਮੀਨੂ ਵਿਕਲਪ ਵਰਤਦੇ ਹੋਏ ਚਿਤਾਵਨੀ ਸੈਟਿੰਗਾਂ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"ਪ੍ਰਸਾਰਨ ਮਿਟਾਓ"</string>
     <string name="message_options" msgid="3178489901903589574">"ਸੁਨੇਹਾ ਚੋਣਾਂ"</string>
@@ -66,7 +66,7 @@
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"ਵਪਾਰਕ ਮੋਬਾਈਲ ਸੁਚੇਤਨਾ ਸਿਸਟਮ ਲਈ ਟੈਸਟ ਪ੍ਰਸਾਰਣ"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"ਥਰਥਰਾਹਟ ਕਰੋ"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"ਪੂਰੀ ਵੌਲਿਊਮ ਦੀ ਵਰਤੋਂਂ ਕਰੋ"</string>
-    <string name="use_full_volume_summary" msgid="3560764277281704697">"ਹੋਰ ਵੌਲਿਊਮ ਅਤੇ \'ਮੈਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤਰਜੀਹਾਂ ਨੂੰ ਅਣਡਿੱਠ ਕਰੋ"</string>
+    <string name="use_full_volume_summary" msgid="3560764277281704697">"ਹੋਰ ਅਵਾਜ਼ ਅਤੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤਰਜੀਹਾਂ ਨੂੰ ਅਣਡਿੱਠ ਕਰੋ"</string>
     <string name="enable_area_update_info_alerts_title" msgid="3442042268424617226">"ਖੇਤਰ ਬਾਰੇ ਤਾਜ਼ਾ ਜਾਣਕਾਰੀ ਦੇ ਪ੍ਰਸਾਰਣ"</string>
     <string name="enable_area_update_info_alerts_summary" msgid="6437816607144264910">"SIM ਅਵਸਥਾ ਵਿੱਚ ਅੱਪਡੇਟ ਦੀ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ਵਿਕਾਸਕਾਰ ਚੋਣਾਂ"</string>
@@ -104,9 +104,9 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"ਪ੍ਰਾਪਤ:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> ਅਨਰੀਡ ਚਿਤਾਵਨੀਆਂ।"</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"ਨਵੀਆਂ ਚਿਤਾਵਨੀਆਂ"</string>
-    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"ਪਹਿਲੀ CMAS ਚਿਤਾਵਨੀ ਡਿਸਪਲੇ ਕਰਨ ਤੋਂ ਬਾਅਦ ਇੱਕ ਔਪਟ-ਆਊਟ ਡਾਇਲੌਗ ਦਿਖਾਓ (ਪ੍ਰੈਜੀਡੈਂਸ਼ੀਅਲ ਚਿਤਾਵਨੀ ਤੋਂ ਇਲਾਵਾ)।"</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"ਪਹਿਲੀ CMAS ਚਿਤਾਵਨੀ ਪ੍ਰਦਰਸ਼ਿਤ ਕਰਨ ਤੋਂ ਬਾਅਦ ਇੱਕ ਔਪਟ-ਆਊਟ ਡਾਇਲੌਗ ਦਿਖਾਓ (ਪ੍ਰੈਜੀਡੈਂਸ਼ੀਅਲ ਚਿਤਾਵਨੀ ਤੋਂ ਇਲਾਵਾ)।"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"ਔਪਟ-ਆਊਟ ਡਾਇਲੌਗ ਦਿਖਾਓ"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"ਇਸ ਵੇਲੇ ਤੁਸੀਂ ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਐਮਰਜੈਂਸੀ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰਨਾ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"ਇਸ ਵੇਲੇ ਤੁਸੀਂ ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰ ਰਹੇ ਹੋ। ਕੀ ਤੁਸੀਂ ਸੰਕਟਕਾਲੀਨ ਚਿਤਾਵਨੀਆਂ ਪ੍ਰਾਪਤ ਕਰਨਾ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"ਹਾਂ"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"ਨਹੀਂ"</string>
     <string name="cb_list_activity_title" msgid="1433502151877791724">"ਸੰਕਟਕਾਲੀਨ ਚੇਤਾਵਨੀ ਸਬੰਧੀ ਇਤਿਹਾਸ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f4f3dc32..34c7fd47 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="3795852619005211509">"Alerty o zagrożeniu"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Ustawienia komunikatów z sieci komórkowej nie są dostępne dla tego użytkownika"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nie ma aktywnych alertów w Twojej okolicy. Alerty możesz zmodyfikować w menu Ustawienia."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nie ma aktywnych alertów w Twojej okolicy. Opcje alertów możesz zmodyfikować w menu Ustawienia."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Ustawienia"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Usuń transmisje"</string>
     <string name="message_options" msgid="3178489901903589574">"Opcje wiadomości"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9f77e0ee..b660f474 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -52,7 +52,7 @@
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Som dos lembretes de alerta"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Dizer mensagem de alerta"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Utilize a síntese de voz para dizer mensagens de alerta de emergência"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Hist. de alertas de emergência"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"Histórico de alertas de emergência"</string>
     <string name="alert_preferences_title" msgid="6001469026393248468">"Preferências de alerta"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Difusões de teste do ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Difusões de teste para o Sistema de Aviso de Terramotos e Tsunamis"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0fe73257..a79eabaf 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -57,9 +57,9 @@
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"Transmissões de teste do ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"Transmissões de teste do Sistema de aviso de tsunamis e terremotos"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"Ameaças extremas"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ameaças extremas contra vida e propriedades"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Ameaças extremas, materiais ou à vida"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ameaças graves"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ameaças graves contra vida e propriedades"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Ameaças graves, materiais ou à vida"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Alertas AMBER"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Boletins de emergência de rapto de crianças"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Transmissões de teste do CMAS"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e3166ea7..b21b9bef 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -115,6 +115,6 @@
     <item msgid="9097229303902157183">"Каждые 2 минуты"</item>
     <item msgid="5718214950343391480">"Каждые 5 минут"</item>
     <item msgid="3863339891188103437">"Каждые 15 минут"</item>
-    <item msgid="6868848414437854609">"Отключить"</item>
+    <item msgid="6868848414437854609">"Отключен"</item>
   </string-array>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7649b23f..0578b20f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Správy informačných služieb"</string>
-    <string name="sms_cb_settings" msgid="3795852619005211509">"Núdzové upozornenia"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"Tiesňové upozornenia"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Tento používateľ nemá k dispozícii nastavenia správ informačných služieb"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Vo vašej oblasti nie sú žiadne aktívne upozornenia. Nastavenia upozornení môžete meniť v Nastaveniach."</string>
@@ -48,7 +48,7 @@
     <string name="emergency_alerts_title" msgid="6605036374197485429">"Upozornenia"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Správy vysielania"</string>
     <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Povoliť upozornenia"</string>
-    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Získavať núdzové upozornenia"</string>
+    <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Prijímať tiesňové upozornenia"</string>
     <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Zvuk pripomenutí upozornení"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Čítať upozornenia"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Čítať tiesňové upozornenia prevodom textu na reč"</string>
@@ -61,7 +61,7 @@
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Závažné hrozby"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Závažné ohrozenie života a majetku"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"Upozornenia AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Bulletiny pohotovosti pre prípady únosov detí"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Tiesňové správy o únosoch detí"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"Testovacie vysielania CMAS"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Testovacie vysielania systému Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrovať"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c09de392..fd84b4d3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Du får för närvarande varningsmeddelanden. Vill du fortsätta ta emot varningsmeddelanden?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ja"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nej"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"Historik över varningar om nödsituation"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"Varningshistorik om nödsituation"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"En gång"</item>
     <item msgid="9097229303902157183">"Varannan minut"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index ef5b4ce7..da62c29e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -49,7 +49,7 @@
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Ujumbe kwa wapokeaji wengi"</string>
     <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Ruhusu arifa"</string>
     <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Pokea arifa za dharura"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Sauti ya kikumbusho cha arifa"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Kikumbusho cha arifa kilie"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Tamka ujumbe wa ilani"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Tumia kipengele cha kusoma maandishi kwa sauti kusoma ujumbe wowote wa dharura"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Historia ya arifa za dharura"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8d205ceb..7d453cf7 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -60,7 +60,7 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"Cana ve mala karşı aşırı düzeyde tehditler"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"Ciddi tehditler"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"Cana ve mala karşı ciddi tehditler"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"SARI uyarılar"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"AMBER uyarıları"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"Çocuk kaçırma acil durum bültenleri"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS test yayınları"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"Ticari Mobil Uyarı Sistemi (CMAS) test yayınları"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 4138ca59..a0d9eb4c 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -49,7 +49,7 @@
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"Tarqatma xabarlar"</string>
     <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"Ogohlantirishlarga ruxsat"</string>
     <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"Favqulodda bildirishnomalar olish"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Eslatmalar tovushi"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"Eslatma tovushi"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Ogohlan. xabarini eshitish"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Favqulodda ogohlantirish xabarlarini eshitish uchun matndan-nutqqa vositasidan foydalanish"</string>
     <string name="emergency_alert_history_title" msgid="8310173569237268431">"Favqulodda xabarlar arxivi"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 26358c01..e95df746 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="3795852619005211509">"緊急警報"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"此使用者無法修改區域廣播設定"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"確定"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"您的區域暫時沒有警示。您可以在 [設定] 選單更改 [警示] 設定。"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"您的區域暫時未有警報。您可以在 [設定] 選單更改 [警報] 設定。"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"設定"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"刪除廣播"</string>
     <string name="message_options" msgid="3178489901903589574">"訊息選項"</string>
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"您目前有接收緊急警報，要繼續接收嗎？"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"是"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"否"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警示記錄"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警報記錄"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"一次"</item>
     <item msgid="9097229303902157183">"每 2 分鐘提醒一次"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 17f219c6..64511a9a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -17,10 +17,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"區域廣播"</string>
-    <string name="sms_cb_settings" msgid="3795852619005211509">"緊急警報"</string>
+    <string name="sms_cb_settings" msgid="3795852619005211509">"緊急警示"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"這位使用者無法修改區域廣播設定"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"確定"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"你的區域目前沒有警示。你可以使用選單中的 [設定] 選項變更 [警示] 設定。"</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"你的區域目前沒有警示。您可以在 [設定] 選單更改 [警示] 設定。"</string>
     <string name="menu_preferences" msgid="3596514894131599202">"設定"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"刪除廣播"</string>
     <string name="message_options" msgid="3178489901903589574">"訊息選項"</string>
@@ -36,34 +36,34 @@
     <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_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_amber_alert" msgid="6154867710264778887">"兒童綁架 (安珀警示)"</string>
     <string name="cmas_required_monthly_test" msgid="6464047268150108932">"緊急警示每月測試"</string>
     <string name="cmas_exercise_alert" msgid="2892255514938370321">"緊急警示 (演習)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"緊急警示 (電信業者自訂)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"緊急警示"</string>
     <string name="cb_other_message_identifiers" msgid="5790068194529377210">"廣播訊息"</string>
-    <string name="emergency_alerts_title" msgid="6605036374197485429">"警報"</string>
+    <string name="emergency_alerts_title" msgid="6605036374197485429">"警示"</string>
     <string name="notification_channel_broadcast_messages" msgid="880704362482824524">"廣播訊息"</string>
-    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"允許警報"</string>
+    <string name="enable_emergency_alerts_title" msgid="2103482403462548059">"允許警示"</string>
     <string name="enable_emergency_alerts_summary" msgid="8171013771243907245">"接收緊急通知"</string>
-    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"警報提醒音效"</string>
+    <string name="alert_reminder_interval_title" msgid="7466642011937564868">"警示提醒音效"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"說出警示訊息"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"使用文字轉語音功能說出緊急警示訊息"</string>
-    <string name="emergency_alert_history_title" msgid="8310173569237268431">"緊急警報紀錄"</string>
-    <string name="alert_preferences_title" msgid="6001469026393248468">"警報偏好設定"</string>
+    <string name="emergency_alert_history_title" msgid="8310173569237268431">"緊急警示紀錄"</string>
+    <string name="alert_preferences_title" msgid="6001469026393248468">"警示偏好設定"</string>
     <string name="enable_etws_test_alerts_title" msgid="3593533226735441539">"ETWS 測試廣播"</string>
     <string name="enable_etws_test_alerts_summary" msgid="8746155402612927306">"地震海嘯警報系統測試廣播"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="5416260219062637770">"重大威脅"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="5832146246627518123">"重大生命財產威脅"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="1066172973703410042">"嚴重威脅"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="5292443310309039223">"嚴重生命財產威脅"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"安珀警報"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="1475030503498979651">"安珀警示"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="4495233280416889667">"兒童綁架緊急事件公告"</string>
     <string name="enable_cmas_test_alerts_title" msgid="9000272842269750162">"CMAS 測試廣播"</string>
-    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"商用行動警報系統測試廣播"</string>
+    <string name="enable_cmas_test_alerts_summary" msgid="2694842049601559724">"商用行動警示系統測試廣播"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"震動"</string>
     <string name="use_full_volume_title" msgid="8581439612945182255">"使用最大音量"</string>
     <string name="use_full_volume_summary" msgid="3560764277281704697">"忽略其他的音量和「零打擾」偏好設定"</string>
@@ -109,7 +109,7 @@
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"你目前已設為接收緊急警示，是否要繼續接收？"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"是"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"否"</string>
-    <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警報紀錄"</string>
+    <string name="cb_list_activity_title" msgid="1433502151877791724">"緊急警示紀錄"</string>
   <string-array name="alert_reminder_interval_entries">
     <item msgid="6595211083588795160">"一次"</item>
     <item msgid="9097229303902157183">"每隔 2 分鐘"</item>
diff --git a/tests/testapp/res/values-en-rCA/strings.xml b/tests/testapp/res/values-en-rCA/strings.xml
new file mode 100644
index 00000000..c4219579
--- /dev/null
+++ b/tests/testapp/res/values-en-rCA/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">"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-hi/strings.xml b/tests/testapp/res/values-hi/strings.xml
index 8638eb18..ae2ae8a0 100644
--- a/tests/testapp/res/values-hi/strings.xml
+++ b/tests/testapp/res/values-hi/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="2704349695846064655">"सेल प्रसारण परीक्षण"</string>
+    <string name="app_label" msgid="2704349695846064655">"सेल ब्रॉडकास्ट (CBC) की जांच"</string>
     <string name="button_etws_earthquake_type" msgid="5391060421937195923">"ETWS भूकंप प्रसारण भेजें"</string>
     <string name="button_etws_tsunami_type" msgid="5866338269041475786">"ETWS सुनामी प्रसारण भेजें"</string>
     <string name="button_etws_earthquake_tsunami_type" msgid="8045617992086252152">"ETWS भूकंप और सुनामी प्रसारण भेजें"</string>
author	android-build-team Robot <android-build-team-robot@google.com>	2017-08-30 07:31:24 +0000
committer	android-build-team Robot <android-build-team-robot@google.com>	2017-08-30 07:31:24 +0000
commit	cd877cc278dd95f62e04c3ea64c62efe18edf86d (patch)
tree	32ee22ae72237c3f7ba86fd7693d4a622560c615
parent	aad38496d0a2b1ac334828e0eb383133ebf1a14c (diff)
parent	ba81e4f1fe5d243b3eb9c75dda21c2518bead06d (diff)
download	android_packages_apps_CellBroadcastReceiver-cd877cc278dd95f62e04c3ea64c62efe18edf86d.tar.gz android_packages_apps_CellBroadcastReceiver-cd877cc278dd95f62e04c3ea64c62efe18edf86d.tar.bz2 android_packages_apps_CellBroadcastReceiver-cd877cc278dd95f62e04c3ea64c62efe18edf86d.zip