Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/CellBroadcastReceiver into cm-13.0"

This reverts commit d49a86273a2e63125f6fa8d38b4fd899acd48264, reversing
changes made to fedb720edf5c5072f52c0d8cfe146f35099f6dd3.

Change-Id: Ifd7cf97357dda9014070d100bc2ea008cd2b3b40

18 files changed, 58 insertions, 57 deletions

diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 4e06f65f..3dfd3785 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -18,6 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7559008249836700599">"Şəbəkə Yayımları"</string>
     <string name="sms_cb_settings" msgid="971917159442705371">"Şəbəkə Yayım ayarları"</string>
+    <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Şəbəkə Yayım ayarları bu istifadəçi üçün əlçatımlı deyil"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Sahənizdə aktiv siqnallar yoxdur. Ayarlar menyu seçimlərini istifadə edərək Siqnal ayarlarını dəyişə bilərsiniz."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Ayarlar"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 598bfadd..a5ca08db 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -68,7 +68,7 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Configuració del Brasil"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Mostra difusions del canal 50"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"A Brasil s\'utilitza el canal 50 per actualitzar la informació sobre una zona"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcions del desenvolupador"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Opcions per a desenvolupadors"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria de l\'alerta:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofísiques"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorològiques"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 37c7e2c5..bc63513f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -90,7 +90,7 @@
     <string name="cmas_response_monitor" msgid="681400164440495749">"نظارت"</string>
     <string name="cmas_response_avoid" msgid="156419597612629270">"اجتناب"</string>
     <string name="cmas_response_assess" msgid="9043534222710563415">"ارزیابی"</string>
-    <string name="cmas_response_none" msgid="5149009359674452959">"هیچکدام"</string>
+    <string name="cmas_response_none" msgid="5149009359674452959">"هیچ‌کدام"</string>
     <string name="cmas_severity_heading" msgid="8437057117822305243">"شدت:"</string>
     <string name="cmas_severity_extreme" msgid="1312013282860183082">"خیلی شدید"</string>
     <string name="cmas_severity_severe" msgid="7504359209737074524">"شدید"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 15467312..82668646 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -50,10 +50,10 @@
     <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Afficher les diffusions d\'alerte d\'urgence"</string>
     <string name="alert_sound_duration_title" msgid="4712853569849108005">"Durée de l\'alarme"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Rappel d\'alerte"</string>
-    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Énoncer le message d\'alerte"</string>
+    <string name="enable_alert_speech_title" msgid="8052104771053526941">"Énoncer un message d\'alerte"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"Utiliser la synthèse vocale pour énoncer des messages d\'alerte d\'urgence"</string>
     <string name="category_etws_settings_title" msgid="4072774251965938576">"Paramètres ETWS"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Afficher diffusions test ETWS"</string>
+    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Afficher les diffusions test ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Afficher les diffusions test du système d\'avertissement pour tremblements de terre et tsunamis"</string>
     <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Afficher les menaces extrêmes"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Afficher les alertes relatives aux menaces extrêmes à la vie et aux biens"</string>
@@ -103,7 +103,7 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"Reçu :"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> alertes non lues"</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nouvelles alertes"</string>
-    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Afficher boîte de dialogue de désactivation après première alerte CMAS (sauf alerte présidentielle)"</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Afficher une boîte de dialogue de désactivation après la 1e alerte CMAS, sauf alerte présidentielle"</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Afficher boîte dialogue de désactivation"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Vous recevez actuellement les alertes d\'urgence. Voulez-vous continuer à les recevoir ?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Oui"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 3689e067..d4f99147 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -53,23 +53,23 @@
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"ચેતવણી સંદેશ બોલો"</string>
     <string name="enable_alert_speech_summary" msgid="356086178962268831">"કટોકટીની ચેતવણીના સંદેશા બોલવા માટે ટેક્સ્ટ-થી-વાણીનો ઉપયોગ કરો"</string>
     <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS સેટિંગ્સ"</string>
-    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS પરીક્ષણ બ્રોડકાસ્ટ્સ દર્શાવો"</string>
+    <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS પરીક્ષણ બ્રોડકાસ્ટ્સ બતાવો"</string>
     <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"અર્થક્વેક સુનામી વૉર્નિંગ સિસ્ટમ માટેનાં પરીક્ષણ બ્રોડકાસ્ટ્સ પ્રદર્શિત કરો"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"અત્યંત જોખમો દર્શાવો"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"અત્યંત જોખમો બતાવો"</string>
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"જીવન અને સંપત્તિના અત્યંત જોખમ માટેની ચેતવણીઓ પ્રદર્શિત કરો"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ગંભીર જોખમો દર્શાવો"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"ગંભીર જોખમો બતાવો"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"જીવન અને સંપત્તિના ગંભીર જોખમ માટેની ચેતવણીઓ પ્રદર્શિત કરો"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER ચેતવણીઓ દર્શાવો"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"AMBER ચેતવણીઓ બતાવો"</string>
     <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"બાળ અપહરણનાં કટોકટીનાં બુલેટિન્સ પ્રદર્શિત કરો (AMBER ચેતવણી)"</string>
-    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS પરીક્ષણ બ્રોડકાસ્ટ્સ દર્શાવો"</string>
+    <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"CMAS પરીક્ષણ બ્રોડકાસ્ટ્સ બતાવો"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"કોમર્શિયલ મોબાઇલ એલર્ટ સિસ્ટમ માટેનાં પરીક્ષણ બ્રોડકાસ્ટ્સ પ્રદર્શિત કરો"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"વાઇબ્રેટ"</string>
     <string name="enable_alert_vibrate_summary" msgid="4328060563316778589">"ચેતવણી પર વાઇબ્રેટ કરો"</string>
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"બ્રાઝિલ માટે સેટિંગ્સ"</string>
-    <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"ચૅનલ 50 બ્રોડકાસ્ટ્સ દર્શાવો"</string>
+    <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"ચૅનલ 50 બ્રોડકાસ્ટ્સ બતાવો"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"ચૅનલ 50 નો ઉપયોગ બ્રાઝિલમાં ક્ષેત્રનાં અપડેટની માહિતી માટે થાય છે"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"વિકાસકર્તાનાં વિકલ્પો"</string>
-    <string name="cmas_category_heading" msgid="3923503130776640717">"ચેતવણીની કેટેગરી:"</string>
+    <string name="cmas_category_heading" msgid="3923503130776640717">"ચેતવણીની કૅટેગરી:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ભૂભૌતિકીય"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"હવામાનશાસ્ત્ર સંબંધી"</string>
     <string name="cmas_category_safety" msgid="2986472639641883453">"સલામતી"</string>
@@ -103,8 +103,8 @@
     <string name="delivery_time_heading" msgid="5980836543433619329">"પ્રાપ્ત કર્યુ:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> વાંચ્યા વગરની ચેતવણીઓ"</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"નવી ચેતવણીઓ"</string>
-    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"પ્રથમ CMAS ચેતવણી પછી એક નાપસંદ સંવાદ દર્શાવો (પ્રમુખપદની ચેતવણી સિવાય અન્ય)."</string>
-    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"નાપસંદ સંવાદ દર્શાવો"</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"પ્રથમ CMAS ચેતવણી પછી એક નાપસંદ સંવાદ બતાવો (પ્રમુખપદની ચેતવણી સિવાય અન્ય)."</string>
+    <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"નાપસંદ સંવાદ બતાવો"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"તમે હાલમાં કટોકટીની ચેતવણીઓ પ્રાપ્ત કરી રહ્યાં છો. શું તમે કટોકટીની ચેતવણીઓ પ્રાપ્ત કરવાનું ચાલુ રાખવા માંગો છો?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"હા"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"નહીં"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index f6767ca8..1ceb6a73 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -39,7 +39,7 @@
     <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Նախագահական զգուշացում"</string>
     <string name="cmas_extreme_alert" msgid="2588720613319969289">"Արտակարգ իրավիճակի զգուշացում՝ ծայրահեղ"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"Արտակարգ իրավիճակի զգուշացում՝ խիստ"</string>
-    <string name="cmas_amber_alert" msgid="6154867710264778887">"Երեխաների առևանգում (թավշյա զգուշացում)"</string>
+    <string name="cmas_amber_alert" msgid="6154867710264778887">"Երեխայի առևանգում (AMBER ծանուցում)"</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>
@@ -59,8 +59,8 @@
     <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Ցուցադրել կյանքի և գույքի համար ծայրահեղ սպառնալիքները"</string>
     <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Ցուցադրել խիստ սպառնալիքները"</string>
     <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Ցուցադրել կյանքի և գույքի համար կարևոր ահազանգերը"</string>
-    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Ցուցադրել թավշյա զգուշացումները"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Ցուցադրել երեխաների առևանգման արտակարգ ամփոփագրերը (թավշյա զգուշացում)"</string>
+    <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Ցուցադրել Amber ծանուցումները"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Ցուցադրել երեխաների առևանգման մասին ծանուցումները (AMBER)"</string>
     <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Ցուցադրել CMAS փորձնական հեռարձակումները"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Ցուցադրել փորձնական հեռարձակումները առևտրային բջջային ահազանգերի համակարգի համար"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Թրթռալ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 039ff58c..f5303e67 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -67,7 +67,7 @@
     <string name="enable_alert_vibrate_summary" msgid="4328060563316778589">"ಎಚ್ಚರಿಕೆಗಾಗಿ ವೈಬ್ರೇಟ್‌"</string>
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"ಬ್ರೆಜಿಲ್‌ಗೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"ಚಾನಲ್ 50 ಪ್ರಸಾರಗಳನ್ನು ತೋರಿಸು"</string>
-    <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"ಪ್ರದೇಶ ನವೀಕರಣ ಮಾಹಿತಿಗಾಗಿ ಬ್ರೆಜಿಲ್‌ನಲ್ಲಿ ಚಾನೆಲ್ 50 ಅನ್ನು ಬಳಸಲಾಗುತ್ತದೆ"</string>
+    <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"ಪ್ರದೇಶ ಅಪ್‌ಡೇಟ್‌‌ ಮಾಹಿತಿಗಾಗಿ ಬ್ರೆಜಿಲ್‌ನಲ್ಲಿ ಚಾನೆಲ್ 50 ಅನ್ನು ಬಳಸಲಾಗುತ್ತದೆ"</string>
     <string name="category_dev_settings_title" msgid="6194393458398329994">"ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"ಎಚ್ಚರಿಕೆ ವಿಭಾಗ:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"ಭೂಭೌತ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index fa30a7db..4f18971e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -51,7 +51,7 @@
     <string name="alert_sound_duration_title" msgid="4712853569849108005">"경고음 지속 시간"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"경고 알림"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"경고 메시지를 음성 언어로 표시"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"비상사태 경고 메시지를 TTX 기능을 사용하여 음성 언어로 알림"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"비상사태 경고 메시지를 TTS 기능을 사용하여 음성 언어로 알림"</string>
     <string name="category_etws_settings_title" msgid="4072774251965938576">"ETWS 설정"</string>
     <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"ETWS 테스트 브로드캐스트 표시"</string>
     <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"지진 해일 경보 시스템용 테스트 브로드캐스트 표시"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index acfd85f2..1382282a 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -68,7 +68,7 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Tetapan untuk Brazil"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Tunjukkan siaran saluran 50"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Saluran 50 digunakan di Brazil untuk memberi maklumat kemas kini kawasan"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Pilihan pemaju"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Pilihan pembangun"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategori Awasan:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizikal"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorologi"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bccf57d2..6f23e685 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -20,7 +20,7 @@
     <string name="sms_cb_settings" msgid="971917159442705371">"Instellingen voor cell broadcasts"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Instellingen voor cell broadcast zijn niet beschikbaar voor deze gebruiker"</string>
     <string name="button_dismiss" msgid="1234221657930516287">"OK"</string>
-    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Er zijn geen actieve waarschuwingen in uw omgeving. U kunt de waarschuwingsinstellingen wijzigen via de menuoptie \'Instellingen\'."</string>
+    <string name="no_cell_broadcasts" msgid="5409324337492758562">"Er zijn geen actieve waarschuwingen in je omgeving. Je kunt de waarschuwingsinstellingen wijzigen via de menuoptie \'Instellingen\'."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Instellingen"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Broadcasts verwijderen"</string>
     <string name="message_options" msgid="3178489901903589574">"Berichtopties"</string>
@@ -105,7 +105,7 @@
     <string name="notification_multiple_title" msgid="1523638925739947855">"Nieuwe waarschuwingen"</string>
     <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Een afmeldingsvenster weergeven na de eerste CMAS-melding (geen nationale melding)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Afmeldingsvenster weergeven"</string>
-    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"U ontvangt momenteel noodmeldingen. Wilt u noodmeldingen blijven ontvangen?"</string>
+    <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"Je ontvangt momenteel noodmeldingen. Wil je noodmeldingen blijven ontvangen?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Ja"</string>
     <string name="cmas_opt_out_button_no" msgid="3110484064328538553">"Nee"</string>
   <string-array name="alert_sound_duration_entries">
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 38eed0ea..c35a71ae 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -36,17 +36,17 @@
     <string name="etws_earthquake_and_tsunami_warning" msgid="662449983177407681">"Avertizare de cutremur și tsunami"</string>
     <string name="etws_test_message" msgid="8447820262584381894">"Mesaj de testare ETWS"</string>
     <string name="etws_other_emergency_type" msgid="5233080551309721499">"Avertizare de urgenţă"</string>
-    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Alertă prezidenţială"</string>
+    <string name="cmas_presidential_level_alert" msgid="1209234030582361001">"Alertă prezidențială"</string>
     <string name="cmas_extreme_alert" msgid="2588720613319969289">"Alertă de urgenţă: extremă"</string>
     <string name="cmas_severe_alert" msgid="4135809475315826913">"Alertă de urgenţă: severă"</string>
     <string name="cmas_amber_alert" msgid="6154867710264778887">"Răpire copil (alertă Amber)"</string>
     <string name="cmas_required_monthly_test" msgid="6464047268150108932">"Testare lunară pentru alerte de urgenţă"</string>
-    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Alertă de urgenţă (exerciţiu)"</string>
+    <string name="cmas_exercise_alert" msgid="2892255514938370321">"Alertă de urgenţă (exercițiu)"</string>
     <string name="cmas_operator_defined_alert" msgid="8755372450810011476">"Alertă de urgenţă (operator)"</string>
     <string name="pws_other_message_identifiers" msgid="1813329661891149820">"Alertă de urgenţă"</string>
     <string name="cb_other_message_identifiers" msgid="7083176204482365281">"Transmisie celulară"</string>
     <string name="emergency_alert_settings_title" msgid="5427868392642771940">"Setări pentru alerte de urgenţă"</string>
-    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activaţi notificările"</string>
+    <string name="enable_emergency_alerts_title" msgid="1411195469162410084">"Activați notificările"</string>
     <string name="enable_emergency_alerts_summary" msgid="5932655529367149358">"Afişaţi difuzările cu alerte de urgenţă"</string>
     <string name="alert_sound_duration_title" msgid="4712853569849108005">"Durata sunetului pentru alertă"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Memento alerte"</string>
@@ -55,12 +55,12 @@
     <string name="category_etws_settings_title" msgid="4072774251965938576">"Setări ETWS"</string>
     <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Afişaţi alerte de test ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Afişaţi difuzările de testare pentru sistemul de avertizare în caz de cutremur și tsunami"</string>
-    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Afişaţi ameninţările extreme"</string>
-    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Afişaţi alertele pentru ameninţările extreme în ceea ce priveşte viaţa și bunurile"</string>
-    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Afişaţi ameninţările grave"</string>
-    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Afişaţi alertele pentru ameninţările grave în ceea ce priveşte viaţa și bunurile"</string>
+    <string name="enable_cmas_extreme_threat_alerts_title" msgid="215650211797464620">"Afişaţi amenințările extreme"</string>
+    <string name="enable_cmas_extreme_threat_alerts_summary" msgid="2493139961243300290">"Afişaţi alertele pentru amenințările extreme în ceea ce priveşte viaţa și bunurile"</string>
+    <string name="enable_cmas_severe_threat_alerts_title" msgid="8008941231371565775">"Afişaţi amenințările grave"</string>
+    <string name="enable_cmas_severe_threat_alerts_summary" msgid="4089299793459943222">"Afişaţi alertele pentru amenințările grave în ceea ce priveşte viaţa și bunurile"</string>
     <string name="enable_cmas_amber_alerts_title" msgid="997138378272381777">"Afişaţi alertele AMBER"</string>
-    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Afişaţi buletinele privind urgenţele în cazuri de răpire de copii (alertă AMBER)"</string>
+    <string name="enable_cmas_amber_alerts_summary" msgid="8423617548641801387">"Afişaţi buletinele privind urgențele în cazuri de răpire de copii (alertă AMBER)"</string>
     <string name="enable_cmas_test_alerts_title" msgid="8620213090932770270">"Afişaţi alerte de test CMAS"</string>
     <string name="enable_cmas_test_alerts_summary" msgid="2935171596891733844">"Afişaţi alerte de test pentru Commercial Mobile Alert System"</string>
     <string name="enable_alert_vibrate_title" msgid="982817538757982090">"Vibrare"</string>
@@ -68,11 +68,11 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Setări pentru Brazilia"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Afişaţi difuz. pt. canalul 50"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Canalul 50 este utilizat în Brazilia pentru informaţii despre actualizarea zonelor"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Opţiuni dezvoltator"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Opțiuni dezvoltator"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Categoria alertei:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofizic"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorologic"</string>
-    <string name="cmas_category_safety" msgid="2986472639641883453">"Siguranţă"</string>
+    <string name="cmas_category_safety" msgid="2986472639641883453">"Siguranță"</string>
     <string name="cmas_category_security" msgid="2549520159044403704">"Securitate"</string>
     <string name="cmas_category_rescue" msgid="4907571719983321086">"Salvare"</string>
     <string name="cmas_category_fire" msgid="3331981591918341119">"Incendiu"</string>
@@ -83,27 +83,27 @@
     <string name="cmas_category_cbrne" msgid="240421557913603971">"Chimic/Biologic/Nuclear/Exploziv"</string>
     <string name="cmas_category_other" msgid="6158932360790744360">"Alta"</string>
     <string name="cmas_response_heading" msgid="4205379547245540163">"Tipul de răspuns:"</string>
-    <string name="cmas_response_shelter" msgid="7301175579079615909">"Adăpostiţi-vă într-un refugiu"</string>
-    <string name="cmas_response_evacuate" msgid="5833170084430021095">"Evacuaţi"</string>
+    <string name="cmas_response_shelter" msgid="7301175579079615909">"Adăpostiți-vă într-un refugiu"</string>
+    <string name="cmas_response_evacuate" msgid="5833170084430021095">"Evacuați"</string>
     <string name="cmas_response_prepare" msgid="8428073909753758319">"Faceţi pregătiri"</string>
     <string name="cmas_response_execute" msgid="284719420769568493">"Executaţi"</string>
     <string name="cmas_response_monitor" msgid="681400164440495749">"Monitorizaţi"</string>
-    <string name="cmas_response_avoid" msgid="156419597612629270">"Evitaţi"</string>
+    <string name="cmas_response_avoid" msgid="156419597612629270">"Evitați"</string>
     <string name="cmas_response_assess" msgid="9043534222710563415">"Evaluaţi"</string>
     <string name="cmas_response_none" msgid="5149009359674452959">"Niciuna"</string>
     <string name="cmas_severity_heading" msgid="8437057117822305243">"Gravitate:"</string>
     <string name="cmas_severity_extreme" msgid="1312013282860183082">"Extremă"</string>
     <string name="cmas_severity_severe" msgid="7504359209737074524">"Gravă"</string>
-    <string name="cmas_urgency_heading" msgid="8218282767913431492">"Urgenţă:"</string>
+    <string name="cmas_urgency_heading" msgid="8218282767913431492">"Urgență:"</string>
     <string name="cmas_urgency_immediate" msgid="1577485208196449288">"Imediat"</string>
-    <string name="cmas_urgency_expected" msgid="6830831119872375936">"Aşteptat"</string>
+    <string name="cmas_urgency_expected" msgid="6830831119872375936">"Așteptat"</string>
     <string name="cmas_certainty_heading" msgid="8374669249736439193">"Certitudine:"</string>
     <string name="cmas_certainty_observed" msgid="3668549749352106472">"Constatată"</string>
     <string name="cmas_certainty_likely" msgid="4254497828943291749">"Probabilă"</string>
     <string name="delivery_time_heading" msgid="5980836543433619329">"Primit:"</string>
     <string name="notification_multiple" msgid="5121978148152124860">"<xliff:g id="COUNT">%s</xliff:g> (de) alerte necitite."</string>
     <string name="notification_multiple_title" msgid="1523638925739947855">"Alerte noi"</string>
-    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Afişaţi un dialog de renunţare după afişarea primei alerte CMAS (altele decât alerta prezidenţială)."</string>
+    <string name="show_cmas_opt_out_summary" msgid="4370292554938680862">"Afişaţi un dialog de renunţare după afişarea primei alerte CMAS (altele decât alerta prezidențială)."</string>
     <string name="show_cmas_opt_out_title" msgid="9182104842820171132">"Afişaţi un dialog de renunţare"</string>
     <string name="cmas_opt_out_dialog_text" msgid="7529010670998259128">"În prezent, primiţi alerte de urgenţă. Doriţi să primiţi în continuare alerte de urgenţă?"</string>
     <string name="cmas_opt_out_button_yes" msgid="7248930667195432936">"Da"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 26ec2f33..dac97a3b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -51,7 +51,7 @@
     <string name="alert_sound_duration_title" msgid="4712853569849108005">"Длительность звукового сигнала"</string>
     <string name="alert_reminder_interval_title" msgid="3283595202268218149">"Периодичность напоминаний"</string>
     <string name="enable_alert_speech_title" msgid="8052104771053526941">"Произносить оповещения"</string>
-    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Использовать функцию преобразования текста в речь для создания аварийных сообщений"</string>
+    <string name="enable_alert_speech_summary" msgid="356086178962268831">"Использовать функцию преобразования текста в речь для чтения экстренных оповещений"</string>
     <string name="category_etws_settings_title" msgid="4072774251965938576">"Настройки системы предупреждения о землетрясении и цунами"</string>
     <string name="enable_etws_test_alerts_title" msgid="2569886288897109169">"Тестовые рассылки ETWS"</string>
     <string name="enable_etws_test_alerts_summary" msgid="7988690174166347072">"Показывать тестовые трансляции для системы предупреждения о землетрясении и цунами"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index cb92ea1c..436fe042 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -68,7 +68,7 @@
     <string name="category_brazil_settings_title" msgid="6343130548572319922">"Nastavenia pre Brazíliu"</string>
     <string name="enable_channel_50_alerts_title" msgid="2818924064446974167">"Zobraziť vysielanie kanála 50"</string>
     <string name="enable_channel_50_alerts_summary" msgid="7507770011325273009">"Kanál 50 sa v Brazílii používa pre aktuálne informácie o oblasti"</string>
-    <string name="category_dev_settings_title" msgid="6194393458398329994">"Možnosti pre vývojárov"</string>
+    <string name="category_dev_settings_title" msgid="6194393458398329994">"Pre vývojárov"</string>
     <string name="cmas_category_heading" msgid="3923503130776640717">"Kategória upozornenia:"</string>
     <string name="cmas_category_geo" msgid="4979494217069688527">"Geofyzikálne"</string>
     <string name="cmas_category_met" msgid="7563732573851773537">"Meteorologické"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 56485afc..570eeec9 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_label" msgid="7559008249836700599">"Transmetimi celular"</string>
     <string name="sms_cb_settings" msgid="971917159442705371">"Cilësimet e transmetimit celular"</string>
     <string name="cell_broadcast_settings_not_available" msgid="2612364350745967915">"Cilësimet e transmetimit celular nuk janë të disponueshme për këtë përdorues"</string>
-    <string name="button_dismiss" msgid="1234221657930516287">"Në rregull!"</string>
+    <string name="button_dismiss" msgid="1234221657930516287">"Në rregull"</string>
     <string name="no_cell_broadcasts" msgid="5409324337492758562">"Nuk ka alarme aktive në zonën tënde. Mund t\'i ndryshosh cilësimet e alarmeve duke përdorur opsionin e menysë \"Cilësimet\"."</string>
     <string name="menu_preferences" msgid="3596514894131599202">"Cilësimet"</string>
     <string name="menu_delete_all" msgid="3940997343921149800">"Fshi transmetimet"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index b326dc3c..4493367e 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -90,7 +90,7 @@
     <string name="cmas_response_monitor" msgid="681400164440495749">"Nazorat qilish"</string>
     <string name="cmas_response_avoid" msgid="156419597612629270">"Qochib qutulish"</string>
     <string name="cmas_response_assess" msgid="9043534222710563415">"Baholash"</string>
-    <string name="cmas_response_none" msgid="5149009359674452959">"Hech biri"</string>
+    <string name="cmas_response_none" msgid="5149009359674452959">"Hech narsa qilinmasin"</string>
     <string name="cmas_severity_heading" msgid="8437057117822305243">"Jiddiylik darajasi:"</string>
     <string name="cmas_severity_extreme" msgid="1312013282860183082">"Keskin"</string>
     <string name="cmas_severity_severe" msgid="7504359209737074524">"Yuqori"</string>
@@ -119,6 +119,6 @@
     <item msgid="6595211083588795160">"Bir marta"</item>
     <item msgid="9097229303902157183">"Har 2 daqiqada"</item>
     <item msgid="5676933700148002666">"Har 15 daqiqada"</item>
-    <item msgid="694355015442188708">"O‘chirilgan"</item>
+    <item msgid="694355015442188708">"O‘chirib qo‘yish"</item>
   </string-array>
 </resources>
diff --git a/tests/res/values-gu-rIN/strings.xml b/tests/res/values-gu-rIN/strings.xml
index 990f981a..c1885bfc 100644
--- a/tests/res/values-gu-rIN/strings.xml
+++ b/tests/res/values-gu-rIN/strings.xml
@@ -41,5 +41,5 @@
     <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"UMTS UCS-2 ભાષા સાથે મોકલો"</string>
     <string name="button_delay_broadcast" msgid="5138650276363839541">"મોકલતા પહેલા 5 સેકંડનો વિલંબ"</string>
     <string name="message_id_label" msgid="4365322663037110887">"સંદેશ ID:"</string>
-    <string name="category_id_label" msgid="8472814003810180738">"કેટેગરી:"</string>
+    <string name="category_id_label" msgid="8472814003810180738">"કૅટેગરી:"</string>
 </resources>
diff --git a/tests/res/values-hy-rAM/strings.xml b/tests/res/values-hy-rAM/strings.xml
index 28632d3a..032b7638 100644
--- a/tests/res/values-hy-rAM/strings.xml
+++ b/tests/res/values-hy-rAM/strings.xml
@@ -23,7 +23,7 @@
     <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Ուղարկել CMAS նախագահական ահազանգ"</string>
     <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Ուղարկել CMAS ծայրահեղ ահազանգ"</string>
     <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Ուղարկել CMAS խիստ ահազանգ"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Ուղարկել CMAS թավշյա ահազանգ"</string>
+    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Ուղարկել AMBER ծանուցում CMAS-ի միջոցով"</string>
     <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Ուղարկել CMAS ամսական փորձնական ահազանգ"</string>
     <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Ուղարկել GSM 7 բիթ փորձնական հեռարձակում"</string>
     <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Ուղարկել UMTS 7 բիթ փորձնական հեռարձակում"</string>
diff --git a/tests/res/values-ro/strings.xml b/tests/res/values-ro/strings.xml
index 49db7e8d..f8b761fa 100644
--- a/tests/res/values-ro/strings.xml
+++ b/tests/res/values-ro/strings.xml
@@ -17,29 +17,29 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2102435118079140813">"Teste transmisie celulară"</string>
-    <string name="button_etws_normal_type" msgid="3852703138521119537">"Trimiteţi difuzare ETWS normală"</string>
+    <string name="button_etws_normal_type" msgid="3852703138521119537">"Trimiteți difuzare ETWS normală"</string>
     <string name="button_etws_cancel_type" msgid="7194264116649371175">"Difuzaţi un mesaj de anulare ETWS"</string>
     <string name="button_etws_test_type" msgid="6353906188028139901">"Difuzaţi un mesaj de test ETWS"</string>
-    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Trimiteţi o alertă prezidenţială CMAS"</string>
-    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Trimiteţi o alertă extremă CMAS"</string>
-    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Trimiteţi o alertă gravă CMAS"</string>
-    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Trimiteţi o alertă CMAS AMBER"</string>
-    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Trimiteţi lunar o alertă de test CMAS"</string>
+    <string name="button_cmas_pres_alert" msgid="5905111586384766558">"Trimiteți o alertă prezidențială CMAS"</string>
+    <string name="button_cmas_extreme_alert" msgid="6111658124447111920">"Trimiteți o alertă extremă CMAS"</string>
+    <string name="button_cmas_severe_alert" msgid="9051731172452500819">"Trimiteți o alertă gravă CMAS"</string>
+    <string name="button_cmas_amber_alert" msgid="4217147800913845288">"Trimiteți o alertă CMAS AMBER"</string>
+    <string name="button_cmas_monthly_test" msgid="1609320625517248393">"Trimiteți lunar o alertă de test CMAS"</string>
     <string name="button_gsm_7bit_type" msgid="4757698592787955850">"Difuzaţi un mesaj de test GSM pe 7 biţi"</string>
     <string name="button_gsm_7bit_umts_type" msgid="4377077702628367387">"Difuzaţi un mesaj de test UMTS pe 7 biţi"</string>
     <string name="button_gsm_7bit_nopadding_type" msgid="5289528095948674862">"Difuzaţi un mesaj de dimensiune completă GSM pe 7 biţi"</string>
     <string name="button_gsm_7bit_nopadding_umts_type" msgid="7953047238483884846">"Difuzaţi un mesaj de dimensiune completă UMTS pe 7 biţi"</string>
     <string name="button_gsm_7bit_multipage_type" msgid="8516540964071070491">"Difuzaţi un mesaj multipagină GSM pe 7 biţi"</string>
     <string name="button_gsm_7bit_multipage_umts_type" msgid="474883728254547100">"Difuzaţi un mesaj multipagină UMTS pe 7 biţi"</string>
-    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Trimiteţi un mesaj GSM pe 7 biţi în care să precizaţi limba"</string>
-    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">" Trimiteţi un mesaj în format GSM pe 7 biţi cu limba în corpul mesajului"</string>
-    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Trimiteţi un mesaj UMTS pe 7 biţi în care să precizaţi limba"</string>
+    <string name="button_gsm_7bit_with_language_type" msgid="7414138913180046493">"Trimiteți un mesaj GSM pe 7 biţi în care să precizați limba"</string>
+    <string name="button_gsm_7bit_with_language_body_gsm_type" msgid="7365993929355114874">" Trimiteți un mesaj în format GSM pe 7 biţi cu limba în corpul mesajului"</string>
+    <string name="button_gsm_7bit_with_language_body_umts_type" msgid="1201329758881885921">"Trimiteți un mesaj UMTS pe 7 biţi în care să precizați limba"</string>
     <string name="button_gsm_ucs2_type" msgid="6652864601384080678">"Difuzaţi un mesaj de test GSM UCS-2"</string>
     <string name="button_gsm_ucs2_umts_type" msgid="2985879481785569626">"Difuzaţi un mesaj de test UMTS UCS-2"</string>
     <string name="button_gsm_ucs2_multipage_umts_type" msgid="4557772309524939206">"Difuzaţi un mesaj multipagină UMTS UCS-2"</string>
-    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Trimiteţi mesaj GSM UCS-2 în care să precizaţi limba"</string>
-    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Trimiteţi un mesaj UMTS UCS-2 în care să precizaţi limba"</string>
-    <string name="button_delay_broadcast" msgid="5138650276363839541">"Întârziaţi 5 secunde înaintea trimiterii"</string>
+    <string name="button_gsm_ucs2_with_language_type" msgid="8992961254390480388">"Trimiteți mesaj GSM UCS-2 în care să precizați limba"</string>
+    <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Trimiteți un mesaj UMTS UCS-2 în care să precizați limba"</string>
+    <string name="button_delay_broadcast" msgid="5138650276363839541">"Întârziați 5 secunde înaintea trimiterii"</string>
     <string name="message_id_label" msgid="4365322663037110887">"ID-ul mesajului:"</string>
     <string name="category_id_label" msgid="8472814003810180738">"Categorie:"</string>
 </resources>