Merge "Revert "Check System permissions for some TelephonyManager System apis."" into pi-dev

commit: 000a1733191bd168d322502d96331b2261fdfa14 [log] [tgz]
author: Amit Mahajan <amitmahajan@google.com> Tue Mar 20 19:27:10 2018 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Mar 20 19:27:10 2018 +0000
tree: 5c704c187927eb7e96efd60fe00cb10db3a034f5
parent: 19086b2596c71d7841b8e445edb65bac0a3f4f72 [diff]
parent: 578e53d051605be52c40df13b909a58cf374b8b8 [diff]
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 82725a5..3ab0ad0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"የሚገኙ አውታረመረቦች"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"በመፈለግ ላይ…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"ምንም አውታረመረብ አልተገኘም።"</string>
-    <string name="network_query_error" msgid="6828516148953325006">"አውታረ መረቦች በመፈለግ ላይ ስህተት"</string>
+    <string name="network_query_error" msgid="8466081377231178298">"አውታረ መረቦችን ማግኘት አልተቻለም። እንደገና ይሞክሩ።"</string>
     <string name="register_on_network" msgid="9055203954040805084">"በ<xliff:g id="NETWORK">%s</xliff:g> ላይ በመመዝገብ ላይ..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"የSIM ካርድህ ወደዚህ አውታረመረብ  ግንኙነት አይፈቅድም።"</string>
     <string name="connect_later" msgid="2308119155752343975">"በአሁን ጊዜ ወደዚህ አውታረ መረብ ማገናኘት አልተቻለም፡፡ በኋላ እንደገና ሞክር፡፡"</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"የአውታረመረቡንመከወኛ ሁነታ ለውጥ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"የሚመረጠው የአውታረ መረብ አይነት"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(የተከለከለ)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"አውታረ መረብ ይምረጡ"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"ግንኙነት ተቋርጧል"</string>
+    <string name="network_connected" msgid="1288589103624338857">"ተገናኝቷል"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"በመገናኘት ላይ..."</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"መገናኘት አልተቻለም"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA ይመረጣል"</item>
     <item msgid="8442633436636425221">"GSM ብቻ"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"በማዛወር ላይ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"የውሂብ ተያያዥነት የጠፋበት ምክንያት የቤትህን አውታረ መረብ እንቅስቃሴ ውሂብ በማጥፋትህ ነው።"</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"የውሂብ ዝውውር ጠፍቷል። ለማብራት መታ ያድርጉ።"</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"የጠፋ የሞባይል ውሂብ ግንኙነት"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"ከፍተኛ ክፍያዎችን ሊያስከትልብዎት ይችላል።"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ለተመኑ የአውታረ መረብ አቅራቢዎን ያነጋግሩ።"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"የውሂብ ዝውውር ፍቀድ?"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 3b0f8c1..80f3f3d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"تجوال"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"اتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"اتصال بخدمات البيانات عند التجوال"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"تم إيقاف تجوال البيانات. انقر للتفعيل."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"اتصال بيانات الجوّال مفقود"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"قد يكلف ذلك رسومًا مرتفعة."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"راجع مقدم الشبكة للتعرف على الأسعار."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"السماح بتجوال البيانات؟"</string>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 850760e..4ca03d6 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Əlçatımlı şəbəkələr"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Axtarılır..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Şəbəkə tapılmadı"</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Şəbəkə axtarışı zamanı xəta baş verdi."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Şəbəkə tapılmadı. Yenidən cəhd edin."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g> şəbəkəsində qeydiyyatdan keçirilir…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Sizin SIM kart bu şəbəkəyə bağlantıya icazə vermir."</string>
     <string name="connect_later" msgid="2308119155752343975">"Hazırda bu şəbəkəyə qoşulmaq olmur. Sonra təkrar sınayın."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Şəbəkə əməliyyat rejimini dəyişin"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tərcih edilən şəbəkə növü"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(qadağandır)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Şəbəkəni seçin"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Bağlantı kəsildi"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Qoşuldu"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Qoşulur..."</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Qoşulmaq mümkün olmadı"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA\'ya üstünlük verilib"</item>
     <item msgid="8442633436636425221">"Yalnız GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Rominq"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Rouminq zamanı data xidmətlərinə qoşulun"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Rouminq zamanı data xidmətlərinə qoşulun"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Siz deaktiv edilmiş rouminq ilə daxili şəbəkəni tərk etdiyiniz üçün data bağlantısını itirdiniz."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Data rominqi deaktivdir. Aktiv etmək üçün klikləyin."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobil data bağlantısı itdi"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Sizə əhəmiyyətli xərclər tətbiq edilə bilər."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Qiymətləndirmə üçün şəbəkə provayderi ilə yoxlayın."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Məlumat rominqinə icazə verilsin?"</string>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 2bd344e..d1f9d0d 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Dostupne mreže"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Pretražuje se…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nisu pronađene mreže."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Greška tokom traženja mreža."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Ne možemo da pronađemo mreže. Probajte ponovo."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrovanje na <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM kartica ne dozvoljava vezu sa ovom mrežom."</string>
     <string name="connect_later" msgid="2308119155752343975">"Trenutno nije moguće povezati se sa ovom mrežom. Probajte ponovo kasnije."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promena režima rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Željeni tip mreže"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(zabranjeno)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Izaberite mrežu"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Veza je prekinuta"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Povezani ste"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Povezuje se..."</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Povezivanje nije uspelo"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA ima prednost"</item>
     <item msgid="8442633436636425221">"Samo GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Povezivanje sa uslugom za podatke tokom rominga"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Povezivanje sa uslugom za podatke tokom rominga"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Veza za prenos podataka je prekinuta zato što ste napustili kućnu mrežu sa isključenim prenosom podataka u romingu."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Prenos podataka u romingu je isključen. Dodirnite da biste ga uključili."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Izgubili ste vezu za prenos mobilnih podataka"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Mogu da nastanu značajni troškovi."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Cene proverite kod mobilnog operatera."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Dozvoljavate prenos podataka u romingu?"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5d30863..000132b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Роуминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Свързване с услуги за данни при роуминг"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Свързване с услуги за данни при роуминг"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Роумингът на данни е изключен. Докоснете за включване."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Мобилната връзка за данни прекъсна"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Това може да доведе до високи такси."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"За цени се обърнете към оператора си."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Да се разреши ли роуминг на данни?"</string>

diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index e77a6da..59bedec 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Dostupne mreže"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Pretraživanje…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nije pronađena nijedna mreža."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Greška prilikom traženja mreža."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Nisu pronađene mreže. Pokušajte ponovo."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registriranje na <xliff:g id="NETWORK">%s</xliff:g> u toku…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Vaša SIM kartica ne dozvoljava povezivanje na ovu mrežu."</string>
     <string name="connect_later" msgid="2308119155752343975">"Trenutno nije moguće povezati se s ovom mrežom. Pokušajte ponovo kasnije."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promijeni način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferirana vrsta mreže"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(zabranjeno)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Odaberite mrežu"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Veza je prekinuta"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Povezan"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Povezivanje…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Povezivanje nije uspjelo"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Preferiraj GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Samo GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Povezivanje na usluge prijenosa podataka u romingu"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Povezivanje na usluge prijenosa podataka u romingu"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Izgubili ste vezu za prijenos podataka jer ste napustili matičnu mrežu dok je roming podataka isključen."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Roming podataka je isključen. Dodirnite da ga uključite."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Veza za prijenos podataka na mobilnoj mreži je izgubljena"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Može dovesti do značajnih troškova."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Raspitajte se kod svog mobilnog operatera za cijene."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Dozvoliti roming podataka?"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 67fbc5d..8fe28d4 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Xarxes disponibles"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"S\'està cercant…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No s\'ha trobat cap xarxa."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"S\'ha produït un error en cercar xarxes."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"No s\'ha pogut trobar cap xarxa. Torna-ho a provar."</string>
     <string name="register_on_network" msgid="9055203954040805084">"S\'està registrant a <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"La targeta SIM no et permet connectar-te a aquesta xarxa."</string>
     <string name="connect_later" msgid="2308119155752343975">"Ara mateix no es pot connectar a aquesta xarxa. Torna-ho a provar més tard."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Canvia el mode de funcionament de la xarxa"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipus de xarxa preferit"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(prohibit)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Tria la xarxa"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Desconnectat"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Connectat"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"S\'està connectant..."</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"No s\'ha pogut connectar"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Mode GSM/WCDMA preferit"</item>
     <item msgid="8442633436636425221">"Només GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Itinerància"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Estableix connexió amb serveis de dades en itinerància"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Estableix connexió amb serveis de dades en itinerància"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Has perdut la connectivitat de dades, perquè has abandonat la xarxa domèstica i la itinerància de dades està desactivada."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"La itinerància de dades està desactivada. Toca per activar-la."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"S\'ha perdut la connexió de dades mòbils"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"És possible que se\'t facturin càrrecs elevats."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Contacta amb el proveïdor de xarxa per saber els preus."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Permetre la itinerància de dades?"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f20492f..3a36cf5 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Používat datové služby při roamingu"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Používat datové služby při roamingu"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Datový roaming je vypnutý. Klepnutím ho zapnete."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobilní datové připojení bylo ztraceno"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Mohou vám být účtovány vysoké poplatky."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Ceny vám sdělí poskytovatel datových služeb."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Povolit datový roaming?"</string>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index cce7ebc..6e0f5dd 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Available networks"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Searching…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No networks found."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Error while searching for networks."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Couldn\'t find networks. Try again."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
     <string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Choose network"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Disconnected"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Connected"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Connecting…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Couldn’t connect"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
     <item msgid="8442633436636425221">"GSM only"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Connect to data services when roaming"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Data roaming is turned off. Tap to turn on."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Lost mobile data connection"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"You may incur significant charges."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Check with your network provider for pricing."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>

diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index dd47d6a..6e0f5dd 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Available networks"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Searching…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No networks found."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Error while searching for networks."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Couldn\'t find networks. Try again."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
     <string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
@@ -176,16 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
-    <!-- no translation found for choose_network_title (4023911977543009350) -->
-    <skip />
-    <!-- no translation found for network_disconnected (2227251609006103194) -->
-    <skip />
-    <!-- no translation found for network_connected (1288589103624338857) -->
-    <skip />
-    <!-- no translation found for network_connecting (4927203097283533783) -->
-    <skip />
-    <!-- no translation found for network_could_not_connect (8254009365807767243) -->
-    <skip />
+    <string name="choose_network_title" msgid="4023911977543009350">"Choose network"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Disconnected"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Connected"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Connecting…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Couldn’t connect"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
     <item msgid="8442633436636425221">"GSM only"</item>
@@ -248,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Connect to data services when roaming"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Data roaming is turned off. Tap to turn on."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Lost mobile data connection"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"You may incur significant charges."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Check with your network provider for pricing."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index cce7ebc..6e0f5dd 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Available networks"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Searching…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No networks found."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Error while searching for networks."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Couldn\'t find networks. Try again."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
     <string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Choose network"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Disconnected"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Connected"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Connecting…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Couldn’t connect"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
     <item msgid="8442633436636425221">"GSM only"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Connect to data services when roaming"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Data roaming is turned off. Tap to turn on."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Lost mobile data connection"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"You may incur significant charges."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Check with your network provider for pricing."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index cce7ebc..6e0f5dd 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Available networks"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Searching…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No networks found."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Error while searching for networks."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Couldn\'t find networks. Try again."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
     <string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(forbidden)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Choose network"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Disconnected"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Connected"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Connecting…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Couldn’t connect"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferred"</item>
     <item msgid="8442633436636425221">"GSM only"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Connect to data services when roaming"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Data roaming is turned off. Tap to turn on."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Lost mobile data connection"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"You may incur significant charges."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Check with your network provider for pricing."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Allow data roaming?"</string>

diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 5b45b64..223fd4b 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‎‎Available networks‎‏‎‎‏‎"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎Searching…‎‏‎‎‏‎"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎No networks found.‎‏‎‎‏‎"</string>
-    <string name="network_query_error" msgid="6828516148953325006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎Error while searching for networks.‎‏‎‎‏‎"</string>
+    <string name="network_query_error" msgid="8466081377231178298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎Couldn\'t find networks. Try again.‎‏‎‎‏‎"</string>
     <string name="register_on_network" msgid="9055203954040805084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎Registering on ‎‏‎‎‏‏‎<xliff:g id="NETWORK">%s</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</string>
     <string name="not_allowed" msgid="5613353860205691579">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎Your SIM card doesn\'t allow a connection to this network.‎‏‎‎‏‎"</string>
     <string name="connect_later" msgid="2308119155752343975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎Can\'t connect to this network right now. Try again later.‎‏‎‎‏‎"</string>
@@ -243,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎Roaming‎‏‎‎‏‎"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎Connect to data services when roaming‎‏‎‎‏‎"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎Connect to data services when roaming‎‏‎‎‏‎"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎You\'ve lost data connectivity because you left your home network with data roaming turned off.‎‏‎‎‏‎"</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‎‏‏‏‎‎‏‏‎Data roaming is turned off. Tap to turn on.‎‏‎‎‏‎"</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‎Lost mobile data connection‎‏‎‎‏‎"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎You may incur significant charges.‎‏‎‎‏‎"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎Check with your network provider for pricing.‎‏‎‎‏‎"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎Allow data roaming?‎‏‎‎‏‎"</string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 080f664..e2aedc0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Saadaolevad võrgud"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Otsimine ..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Võrke ei leitud."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Viga võrkude otsimisel."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Võrke ei õnnestunud leida. Proovige uuesti."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registreerimine võrku <xliff:g id="NETWORK">%s</xliff:g> ..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Teie SIM-kaart ei võimalda ühendust selle võrguga."</string>
     <string name="connect_later" msgid="2308119155752343975">"Võrguga ei saa praegu ühendust. Proovige hiljem uuesti."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Muuda võrgu töörežiimi"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Eelistatud võrgutüüp"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(keelatud)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Vali võrk"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Ühendus on katkestatud"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Ühendatud"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Ühendamine …"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Ühendust ei õnnestunud luua"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Eelistatud: GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Ainult GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Rändlus"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Ühenda rändluse ajal andmesideteenustega"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Ühenda rändluse ajal andmesideteenustega"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Andmesideühendus katkes, kuna lahkusite koduvõrgust ja andmesiderändlus oli välja lülitatud."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Andmeside rändlus on välja lülitatud. Puudutage sisselülitamiseks."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobiilne andmesideühendus katkes"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Lisanduda võivad suured tasud."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Hinnakirja küsige oma võrguteenuse pakkujalt."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Kas lubada andmeside rändlus?"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index df376f4..626efc1 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Itinérance"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Se connecter aux services de données lors de l\'itinérance"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Se connecter aux services de données lors de l\'itinérance"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"L\'itinérance des données est désactivée. Touchez pour l\'activer."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Connexion de données mobiles perdue"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Des frais importants peuvent s\'appliquer."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Communiquez avec votre fournisseur réseau pour connaître les tarifs."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Autoriser les données en itinérance?"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a43be8e..65c8aa3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Itinérance"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Se connecter aux services de données lors de l\'itinérance"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Se connecter aux services de données lors de l\'itinérance"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"L\'itinérance des données est désactivée. Appuyez pour l\'activer."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Perte de la connexion des données mobiles"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Des frais importants peuvent s\'appliquer."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Vérifiez le tarif auprès de votre opérateur."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Autoriser l\'itinérance des données ?"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index bda15ae..6d65e02 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Elérhető hálózatok"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Keresés…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nem található hálózat."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Hiba történt a hálózatok keresése közben."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Nincs hálózat. Próbálkozzon újra."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Regisztrálás a(z) <xliff:g id="NETWORK">%s</xliff:g> hálózaton..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM kártyája nem teszi lehetővé a kapcsolódást ehhez a hálózathoz."</string>
     <string name="connect_later" msgid="2308119155752343975">"Most nem lehet csatlakozni a hálózathoz. Próbálja meg később."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"A hálózati üzemmód megváltoztatása"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferált hálózattípus"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(tiltott)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Hálózat kiválasztása"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Nincs kapcsolat"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Csatlakoztatva"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Csatlakozás…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Nem sikerült csatlakozni"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA a preferált"</item>
     <item msgid="8442633436636425221">"Csak GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Barangolás"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Csatlakozás adatszolgáltatásokhoz barangolás során"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Csatlakozás adatszolgáltatásokhoz barangolás során"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Megszakadt az adatkapcsolat, mert elhagyta az otthoni hálózatot, és az adatbarangolás nincs bekapcsolva."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Az adatbarangolás ki van kapcsolva. Koppintson a bekapcsolásához."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Nincs mobiladat-kapcsolat"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Lehet, hogy jelentős összeget számítanak fel érte."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Az árakat a szolgáltatótól tudhatja meg."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Engedélyezi az adatbarangolást?"</string>

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index adfff7b..fdadd53 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Ռոումինգ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Ռոումինգում բջջային ինտերնետն անջատած է: Հպեք՝ միացնելու համար:"</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Բջջային ինտերնետը կորավ"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Դրա համար ձեզանից կարող են խոշոր վճարներ գանձվել:"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Գների վերաբերյալ տեղեկություններ ստանալու համար դիմեք ձեր օպերատորին:"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Թույլատրե՞լ տվյալների ռոումինգը:"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4f30179..b272823 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Sambungkan ke layanan data ketika roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Sambungkan ke layanan data ketika roaming"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Roaming data dinonaktifkan. Tap untuk mengaktifkan."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Koneksi data seluler terputus"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Anda dapat dikenakan biaya yang cukup besar."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Hubungi penyedia jaringan untuk mengetahui harganya."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Izinkan roaming data?"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 49755cb..62d1268 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"רשתות זמינות"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"מחפש..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"לא נמצאו רשתות."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"שגיאה במהלך חיפוש רשתות."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"לא נמצאו רשתות. אפשר לנסות שוב."</string>
     <string name="register_on_network" msgid="9055203954040805084">"נרשם ב-<xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"‏כרטיס ה-SIM לא מאפשר חיבור לרשת זו."</string>
     <string name="connect_later" msgid="2308119155752343975">"לא ניתן להתחבר לרשת זו כעת. נסה שוב מאוחר יותר."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"שנה את מצב ההפעלה של הרשת"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"סוג רשת מועדף"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(אסור)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"בחירת רשת"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"המכשיר מנותק"</string>
+    <string name="network_connected" msgid="1288589103624338857">"המכשיר מחובר"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"המכשיר מתחבר…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"לא ניתן להתחבר"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"‏GSM/WCDMA מועדפת"</item>
     <item msgid="8442633436636425221">"‏GSM בלבד"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"נדידה"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"התחבר לשירותי נתונים בעת נדידה"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"התחבר לשירותי נתונים בעת נדידה"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית כשהנדידה כבויה."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"הנדידה מושבתת. אפשר להקיש כדי להפעיל אותה."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"המכשיר התנתק מחבילת הגלישה"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"ייתכנו שיעורי חיוב גבוהים."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"למידע נוסף על המחירים, יש לפנות לספק השירות."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"האם לאפשר נדידה?"</string>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index fa1e41f..39d0c56 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Қол жетімді желілер"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Іздеуде…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Ешқандай желілер табылмады."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Желі іздеу барысында қателік орын алды."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Желілер табылмады. Қайталап көріңіз."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g> желісіне тіркелуде…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM картаңыз бұл желіге жалғануға рұқсат бермейді."</string>
     <string name="connect_later" msgid="2308119155752343975">"Дәл қазір бұл желіге жалғана алмайды. Кейінірек қайта әрекеттеніп көріңіз."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Желі жұмысының режимін өзгерту"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Қалаулы желі түрі"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(тыйым салынған)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Желі таңдау"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Желіге жалғанбаған"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Қосылды"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Қосылуда…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Қосылмады"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA таңдалған"</item>
     <item msgid="8442633436636425221">"Тек қана GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Роуминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Роуминг кезінде дерек қызметтеріне қосу"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Роуминг кезінде дерек қызметтеріне қосу"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Дерекқор байланысын жоғалтып алдыңыз, себебі үйдегі желінің дерекқор роумингін өшірілген күйінде қалдырғансыз."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Роуминг өшірулі. Қосу үшін түртіңіз."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Ұялы байланыс жоғалып кетті"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Қомақты ақы алынуы мүмкін."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Бағасын желі провайдерінен біліңіз."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Деректер роумингіне рұқсат берілсін бе?"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5d13a1d..c956957 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Pieejamie tīkli"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Notiek meklēšana…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Neviens tīkls nav atrasts."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Tīklu meklēšanas laikā radās kļūda."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Neizdevās atrast tīklus. Mēģiniet vēlreiz."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Notiek reģistrēšana šādā tīklā: <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM karte neļauj izveidot savienojumu ar šo tīklu."</string>
     <string name="connect_later" msgid="2308119155752343975">"Pašlaik nevar izveidot savienojumu ar šo tīklu. Vēlāk mēģiniet vēlreiz."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Mainiet tīkla darbības režīmu"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ieteicamais tīkla veids"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(aizliegts)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Izvēlēties tīklu"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Savienojums pārtraukts"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Savienojums izveidots"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Notiek savienojuma izveide..."</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Nevarēja izveidot savienojumu"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Ieteicamais režīms: GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Tikai GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Viesabonēšana"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Datu savienojamība ir zaudēta, jo mājas tīkls ar datu viesabonēšanu ir izslēgts."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Datu viesabonēšana ir izslēgta. Pieskarieties, lai to ieslēgtu."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Zaudēts mobilais datu savienojums"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Var rasties ievērojamas izmaksas."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Sazinieties ar savu tīkla pakalpojumu sniedzēju, lai uzzinātu par tarifiem."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Vai atļaut datu viesabonēšanu?"</string>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index b925c89..90907e3 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Роаминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Поврзи се со интернет услуги во роаминг"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Поврзи се со интернет услуги во роаминг"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Интернет-роамингот е исклучен. Допрете за да се вклучи."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Мобилната интернет-врска се прекина"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Може да направите големи трошоци."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"За цени, проверете кај вашиот интернет-оператор."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дозволи интернет-роаминг?"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 36b1d04..60236ab 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Perayauan"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Sambung ke perkhidmatan data semasa perayauan"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Sambung ke perkhidmatan data semasa perayauan"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Perayauan data dimatikan. Ketik untuk menghidupkan."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Sambungan data mudah alih terputus"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Anda mungkin dikenakan caj yang tinggi."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Semak dengan penyedia rangkaian untuk mendapatkan harga."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Benarkan perayauan data?"</string>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 86312d7..9eab69a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်း"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"ကွန်ရက်ပြင်ပဒေတာကို သုံးနေစဉ် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"ကွန်ရက်ပြင်ပဒေတာကို သုံးနေစဉ် ဒေတာဝန်ဆောင်မှုများကို ချိတ်ဆက်ပါ"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"ကွန်ရက်ပြင်ပဒေတာသုံးခြင်းကို ပိတ်ထားပါသည်။ ဖွင့်ရန် တို့ပါ။"</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"မိုဘိုင်းဒေတာ ချိတ်ဆက်မှု မရှိတော့ပါ"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"သိသာသည့် ငွေနူန်းထားသင့်အား ကျသင့်နိုင်ပါသည်။"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"ဈေးနှုန်းသိရှိရန် သင်၏ ကွန်ရက်ဝန်ဆောင်မှုပေးသူကို မေးပါ။"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"ကွန်ရက်ပြင်ပဒေတာအသုံးပြုခြင်း ခွင့်ပြုမည်လား?"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a48aa92..46a6f54 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Dostępne sieci"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Wyszukiwanie..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nie znaleziono sieci."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Podczas wyszukiwania sieci wystąpił błąd."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Nie udało się znaleźć sieci. Spróbuj ponownie."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Rejestrowanie w <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Karta SIM nie pozwala na połączenia z tą siecią."</string>
     <string name="connect_later" msgid="2308119155752343975">"Nie można teraz połączyć się z tą siecią. Spróbuj ponownie później."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmień tryb działania sieci"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferowany typ sieci"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(dostęp zabroniony)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Wybierz sieć"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Rozłączono"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Połączono"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Łączę..."</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Nie udało się połączyć"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Preferowany GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Tylko GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Połącz z usługami transmisji danych podczas roamingu"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Połącz z usługami transmisji danych podczas roamingu"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Połączenie transmisji danych zostało utracone, ponieważ opuszczono sieć macierzystą przy wyłączonej opcji danych w roamingu."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Roaming danych jest wyłączony. Kliknij, aby go włączyć."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Utracono połączenie mobilnej transmisji danych"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Mogą się z tym wiązać wysokie opłaty."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Aby poznać ceny, skontaktuj się z operatorem komórkowym."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Zezwolić na roaming danych?"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 19cc51c..3bae883 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Redes disponíveis"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"A pesquisar..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Nenhuma rede encontrada."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Erro ao procurar redes."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Não foi possível localizar nenhuma rede. Tente novamente."</string>
     <string name="register_on_network" msgid="9055203954040805084">"A registar em <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"O cartão SIM não permite uma ligação a esta rede."</string>
     <string name="connect_later" msgid="2308119155752343975">"De momento, não é possível estabelecer ligação com esta rede. Tente novamente mais tarde."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de funcionamento em rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferencial"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(proibida)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Escolher rede"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Desligado"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Ligado"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"A ligar…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Não foi possível estabelecer ligação"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA preferido"</item>
     <item msgid="8442633436636425221">"Apenas GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Ligar a serviços de dados em roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Ligar a serviços de dados em roaming"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"A conectividade de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desativado."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"O roaming de dados está desativado. Toque para ativar."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"A ligação de dados móveis foi perdida"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Podem ser cobrados custos significativos."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Consulte o seu fornecedor de serviços de rede para obter preços."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Pretende permitir roaming de dados?"</string>

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 0a7e305..85ec726 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"රෝමිං"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"රෝමින් අතරතුර දත්ත සේවා වෙත සම්බන්ධ වන්න"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"රෝමින් අතරතුර දත්ත සේවා වෙත සම්බන්ධ වන්න"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"දත්ත රෝමිං ක්‍රියාවිරහිත කර ඇත. ක්‍රියාත්මක කිරීමට තට්ටු කරන්න."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"ජංගම දත්ත සම්බන්ධතාව නැතිවීම"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"ඔබ සැලකිය යුතු ගාස්තු ඇති විය හැකිය."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"මිල ගණන් සඳහා ඔබගේ ජාල සැපයුම්කරු සමඟ පරීක්ෂා කරන්න."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"දත්ත රෝමින් සඳහා අවසර දෙන්න ද?"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f645018..18869b5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Доступне мреже"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Претражује се…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Нису пронађене мреже."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Грешка током тражења мрежа."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Не можемо да пронађемо мреже. Пробајте поново."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Регистровање на <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM картица не дозвољава везу са овом мрежом."</string>
     <string name="connect_later" msgid="2308119155752343975">"Тренутно није могуће повезати се са овом мрежом. Пробајте поново касније."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промена режима рада мреже"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Жељени тип мреже"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(забрањено)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Изаберите мрежу"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Веза је прекинута"</string>
+    <string name="network_connected" msgid="1288589103624338857">"Повезани сте"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"Повезује се..."</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Повезивање није успело"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"GSM/WCDMA има предност"</item>
     <item msgid="8442633436636425221">"Само GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Роминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Повезивање са услугом за податке током роминга"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Повезивање са услугом за податке током роминга"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Веза за пренос података је прекинута зато што сте напустили кућну мрежу са искљученим преносом података у ромингу."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Пренос података у ромингу је искључен. Додирните да бисте га укључили."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Изгубили сте везу за пренос мобилних података"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Могу да настану значајни трошкови."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Цене проверите код мобилног оператера."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дозвољавате пренос података у ромингу?"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ff18680..c9901c2 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Anslut till datatjänster vid roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Anslut till datatjänster vid roaming"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Dataroaming är avstängd. Tryck för att aktivera."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Mobildataanslutningen avbruten"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Detta kan leda till höga kostnader."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Kontakta din nätoperatör för priser."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Vill du tillåta dataroaming?"</string>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index dce282f..018550d 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"ரோமிங்"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"ரோமிங்கின் போது தரவு சேவைகளுடன் இணை"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"ரோமிங்கின் போது தரவு சேவைகளுடன் இணை"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"டேட்டா ரோமிங் முடக்கத்தில் உள்ளது. இயக்க, தட்டவும்."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"மொபைல் டேட்டா இணைப்பு இல்லை"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"குறிப்பிடத்தக்க பேமெண்ட்கள் இருக்கலாம்."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"உங்கள் நெட்வொர்க் வழங்குநர் விதிக்கும் கட்டணத்தைப் பார்க்கவும்."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"தரவு ரோமிங்கை அனுமதிக்கவா?"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4068a70..36ce3ce 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"เครือข่ายที่ใช้งานได้"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"กำลังค้นหา…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"ไม่พบเครือข่าย"</string>
-    <string name="network_query_error" msgid="6828516148953325006">"พบข้อผิดพลาดขณะค้นหาเครือข่าย"</string>
+    <string name="network_query_error" msgid="8466081377231178298">"ไม่พบเครือข่าย ลองอีกครั้ง"</string>
     <string name="register_on_network" msgid="9055203954040805084">"กำลังลงทะเบียนบน <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"ซิมการ์ดของคุณไม่อนุญาตให้เชื่อมต่อกับเครือข่ายนี้"</string>
     <string name="connect_later" msgid="2308119155752343975">"ไม่สามารถเชื่อมต่อเครือข่ายนี้ได้ในขณะนี้ ลองอีกครั้งในภายหลัง"</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"เปลี่ยนโหมดปฏิบัติการของเครือข่าย"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ประเภทเครือข่ายที่ต้องการ"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(ห้ามใช้)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"เลือกเครือข่าย"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"เลิกเชื่อมต่อแล้ว"</string>
+    <string name="network_connected" msgid="1288589103624338857">"เชื่อมต่อแล้ว"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"กำลังเชื่อมต่อ..."</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"เชื่อมต่อไม่ได้"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"ต้องการ GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"GSM เท่านั้น"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"โรมมิ่ง"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"เชื่อมต่ออินเทอร์เน็ตมือถือขณะโรมมิ่ง"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"เชื่อมต่ออินเทอร์เน็ตมือถือขณะโรมมิ่ง"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"การเชื่อมต่อข้อมูลของคุณหายไปเนื่องจากคุณออกจากเครือข่ายที่บ้านโดยปิดการโรมมิ่งข้อมูลไว้"</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"การโรมมิ่งข้อมูลปิดอยู่ แตะเพื่อเปิด"</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"การเชื่อมต่อข้อมูลผ่านมือถือถูกตัด"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"คุณอาจต้องเสียค่าใช้จ่ายมาก"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"โปรดสอบถามผู้ให้บริการเครือข่ายสำหรับข้อมูลเกี่ยวกับราคา"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"อนุญาตการโรมมิ่งอินเทอร์เน็ตไหม"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7d491e1..c81c6f3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -163,7 +163,7 @@
     <string name="label_available" msgid="1181658289009300430">"Доступні мережі"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Пошук…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Не знайд. жодних мереж."</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Помилка під час пошуку мереж."</string>
+    <string name="network_query_error" msgid="8466081377231178298">"Не вдалося знайти мережу. Повторіть спробу."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Реєстрування у <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"Ваша SIM-карта не дозволяє під’єднання до цієї мережі."</string>
     <string name="connect_later" msgid="2308119155752343975">"Зараз неможливо під’єднатися до цієї мережі. Повторіть спробу пізніше."</string>
@@ -176,6 +176,11 @@
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змінити режим роботи мережі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Тип мережі"</string>
     <string name="forbidden_network" msgid="4384929668343563440">"(заборонено)"</string>
+    <string name="choose_network_title" msgid="4023911977543009350">"Вибрати мережу"</string>
+    <string name="network_disconnected" msgid="2227251609006103194">"Від’єднано"</string>
+    <string name="network_connected" msgid="1288589103624338857">"З’єднано"</string>
+    <string name="network_connecting" msgid="4927203097283533783">"З’єднання…"</string>
+    <string name="network_could_not_connect" msgid="8254009365807767243">"Не вдалося з’єднатися"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="3628460389382468528">"Рекомендовано GSM/WCDMA"</item>
     <item msgid="8442633436636425221">"Лише GSM"</item>
@@ -238,7 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"Роумінг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Підключатися до служб передавання даних у роумінгу"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Підключатися до служб передавання даних у роумінгу"</string>
-    <string name="roaming_reenable_message" msgid="8913735676127858115">"Доступ до даних утрачено, оскільки ви вийшли з домашньої мережі з вимкненим роумінгом даних."</string>
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"Роумінг даних вимкнено. Натисніть, щоб увімкнути."</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"Від’єднано від мобільного Інтернету"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Може стягуватися значна плата."</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"Докладніше про ціни можна дізнатися в оператора мережі."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Дозволити роумінг даних?"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 07594ad..add621b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"漫游"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"漫游时连接到移动数据网络服务"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"漫游时连接到移动数据网络服务"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"数据网络漫游已停用。点按即可启用。"</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"移动网络连接中断"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"这可能会产生高额费用。"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"请与您的网络服务提供商联系以了解定价。"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"要允许移动数据网络漫游吗？"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 751a7a5..603a3bd 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"漫遊"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"漫遊時連線到數據服務"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"漫遊時連線到數據服務"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"漫遊服務已關閉，輕觸即可開啟。"</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"行動數據連線中斷"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"您可能需要支付龐大的費用。"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"請聯絡您的網絡供應商查詢定價。"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"要允許數據漫遊嗎？"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2d3b0f8..6da342c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -243,10 +243,8 @@
     <string name="roaming" msgid="7894878421600247140">"漫遊"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"漫遊時連線到數據傳輸服務"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"漫遊時連線到數據傳輸服務"</string>
-    <!-- no translation found for roaming_reenable_message (6843814381576397939) -->
-    <skip />
-    <!-- no translation found for roaming_notification_title (4749053220884743110) -->
-    <skip />
+    <string name="roaming_reenable_message" msgid="6843814381576397939">"漫遊服務已關閉，輕觸即可開啟。"</string>
+    <string name="roaming_notification_title" msgid="4749053220884743110">"行動數據連線中斷"</string>
     <string name="roaming_warning" msgid="1603164667540144353">"您可能需要支付可觀的費用。"</string>
     <string name="roaming_check_price_warning" msgid="7497570906830902550">"請向你的網路供應商洽詢定價。"</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"允許漫遊服務？"</string>

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 8b37a52..d482811 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java

@@ -56,6 +56,7 @@
 import com.android.internal.telephony.IccCardConstants;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.TelephonyPermissions;
 import com.android.internal.util.FastXmlSerializer;
 import com.android.internal.util.IndentingPrintWriter;
 
@@ -786,12 +787,23 @@
     @Override public
     @NonNull
     PersistableBundle getConfigForSubId(int subId) {
+        // TODO(b/73136824): Migrate to TelephonyPermissions#checkCallingOrSelfReadPhoneState.
         try {
             mContext.enforceCallingOrSelfPermission(READ_PRIVILEGED_PHONE_STATE, null);
             // SKIP checking run-time READ_PHONE_STATE since using PRIVILEGED
         } catch (SecurityException e) {
-            mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, null);
+            try {
+                mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, null);
+            } catch (SecurityException securityException) {
+                // If we don't have the runtime permission, but do have carrier privileges, that
+                // suffices for reading phone state.
+                if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+                    throw securityException;
+                }
+                TelephonyPermissions.enforceCallingOrSelfCarrierPrivilege(subId, null);
+            }
         }
+
         int phoneId = SubscriptionManager.getPhoneId(subId);
         PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();
         if (SubscriptionManager.isValidPhoneId(phoneId)) {

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index beae63a..a13cd11 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java

@@ -2050,7 +2050,13 @@
                 mApp, subId, callingPackage, "getVisualVoicemailPackageName")) {
             return null;
         }
-        return RemoteVvmTaskManager.getRemotePackage(mPhone.getContext(), subId).getPackageName();
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return RemoteVvmTaskManager
+                    .getRemotePackage(mPhone.getContext(), subId).getPackageName();
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
     }
 
     @Override
@@ -2708,14 +2714,6 @@
     }
 
     /**
-     * @return true if emergency calling is available on IMS, false if it should fallback to CS.
-     */
-    public boolean isEmergencyMmTelAvailable(int slotId) {
-        enforceModifyPermission();
-        return PhoneFactory.getImsResolver().isEmergencyMmTelAvailable(slotId);
-    }
-
-    /**
      * @return true if the IMS resolver is busy resolving a binding and should not be considered
      * available, false if the IMS resolver is idle.
      */

diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index e63215a..d078d7c 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml

@@ -14,11 +14,13 @@
      limitations under the License.
 -->
 <configuration description="Run Phone application tests.">
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-suite-tag" value="apct-instrumentation" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="TeleServiceTests.apk" />
     </target_preparer>
 
-    <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="TeleServiceTests" />
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.phone.tests" />
commit	000a1733191bd168d322502d96331b2261fdfa14	[log] [tgz]
author	Amit Mahajan <amitmahajan@google.com>	Tue Mar 20 19:27:10 2018 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Mar 20 19:27:10 2018 +0000
tree	5c704c187927eb7e96efd60fe00cb10db3a034f5
parent	19086b2596c71d7841b8e445edb65bac0a3f4f72 [diff]
parent	578e53d051605be52c40df13b909a58cf374b8b8 [diff]