Merge "Change getActiveSubscriptionInfoForIccIndex to getActiveSubscriptionInfoForIcc"

commit: cd4fa8c67fb7af4ed714abd2187b764e23bd8781 [log] [tgz]
author: Shuo Qian <shuoq@google.com> Tue Jan 07 21:27:31 2020 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Jan 07 21:27:31 2020 +0000
tree: 1d7d51ef5cc6e68c2a24920466a3ec74425bda25
parent: 3a139b22b5a35d4fa39ed305eae871408ebc9fca [diff]
parent: dfc85889300e8014cc4fec703a308f89ceee5ebe [diff]
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e95e8df..f4b98f4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -129,8 +129,8 @@
     <uses-permission android:name="android.permission.WRITE_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.SEND_RESPOND_VIA_MESSAGE" />
-    <uses-permission android:name="android.permission.SET_TIME" />
     <uses-permission android:name="android.permission.SET_TIME_ZONE" />
+    <uses-permission android:name="android.permission.SUGGEST_PHONE_TIME_AND_ZONE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 576132c..df793ce 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"ተገናኝቷል"</string>
     <string name="network_connecting" msgid="160901383582774987">"በመገናኘት ላይ..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"መገናኘት አልተቻለም"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA ይመረጣል"</item>
+    <item msgid="5120532750027435355">"GSM ብቻ"</item>
+    <item msgid="8973311380798000102">"WCDMA ብቻ"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA ራስ-ሰር"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo ራስ-ሰር"</item>
+    <item msgid="7199560024080522581">"CDMA ያለ EvDo"</item>
+    <item msgid="3160291725308400608">"EvDo ብቻ"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"ዓለም አቀፍ"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA ብቻ"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR ብቻ"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"ተመራጭ የአውታረመረብ ፡WCDMA ሁነታ ተመራጭ"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"ተመራጭ የአውታረመረብ ፡GSM ሁነታ ብቻ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"ተመራጭ የአውታረመረብ ፡WCDMA ሁነታ ብቻ"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5ab3c86..5a25f1d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"متصل"</string>
     <string name="network_connecting" msgid="160901383582774987">"جارٍ الاتصال…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"تعذّر الاتصال"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"‏GSM/WCDMA المفضل"</item>
+    <item msgid="5120532750027435355">"‏نظام GSM فقط"</item>
+    <item msgid="8973311380798000102">"‏WCDMA فقط"</item>
+    <item msgid="4139961027147085705">"‏GSM/WCDMA تلقائي"</item>
+    <item msgid="4024581977690585814">"‏CDMA/EvDo تلقائي"</item>
+    <item msgid="7199560024080522581">"CDMA w/o EvDo"</item>
+    <item msgid="3160291725308400608">"‏EvDo فقط"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"عامّة"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"‏TDSCDMA فقط"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"‏NR فقط"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"‏وضع الشبكة المفضل: تم تفضيل WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"‏وضع الشبكة المفضل: GSM فقط"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"‏وضع الشبكة المفضل: WCDMA فقط"</string>

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index bf746d2..2448f6b 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"সংযোগ কৰা হ’ল"</string>
     <string name="network_connecting" msgid="160901383582774987">"সংযোগ কৰি থকা হৈছে..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"সংযোগ কৰিব পৰা নগ\'ল"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA অগ্ৰাধিকাৰ দিয়া হৈছে"</item>
+    <item msgid="5120532750027435355">"GSM মাত্ৰ"</item>
+    <item msgid="8973311380798000102">"WCDMA মাত্ৰ"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA স্বয়ংক্ৰিয়"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo স্বয়ংক্ৰিয়"</item>
+    <item msgid="7199560024080522581">"EvDo নোহোৱাকৈ CDMA"</item>
+    <item msgid="3160291725308400608">"EvDo মাত্ৰ"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"গোলকীয়"</item>
+    <item msgid="8522859526931346931">"এলটিই"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA মাত্ৰ"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"কেৱল NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: WCDMA অগ্ৰাধিকাৰ দিয়া হৈছে"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: GSM মাত্ৰ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্ক ম\'ড: WCDMA মাত্ৰ"</string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 1632220..b3fb187 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Падключана"</string>
     <string name="network_connecting" msgid="160901383582774987">"Ідзе падключэнне..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Не атрымалася падключыцца"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"Прыярытэт GSM/WCDMA"</item>
+    <item msgid="5120532750027435355">"Толькі GSM"</item>
+    <item msgid="8973311380798000102">"Толькі WCDMA"</item>
+    <item msgid="4139961027147085705">"Аўтаматычны выбар GSM/WCDMA"</item>
+    <item msgid="4024581977690585814">"Аўтаматычны выбар CDMA/EvDo"</item>
+    <item msgid="7199560024080522581">"CDMA без EvDo"</item>
+    <item msgid="3160291725308400608">"Толькі EVDO"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Увесь свет"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"Толькі TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Толькі NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Пераважны рэжым сеткі: пераважна WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Пераважны рэжым сеткі: толькі GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Пераважны рэжым сеткі: толькі WCDMA"</string>

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 3af4f65..4e4f3b1 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"কানেক্ট হয়েছে"</string>
     <string name="network_connecting" msgid="160901383582774987">"কানেক্ট করা হচ্ছে..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"কানেক্ট করা যায়নি"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA ব্যবহার করতে চাই"</item>
+    <item msgid="5120532750027435355">"শুধুমাত্র GSM"</item>
+    <item msgid="8973311380798000102">"শুধুমাত্র WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA অটোমেটিক"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo অটোমেটিক"</item>
+    <item msgid="7199560024080522581">"EvDo ছাড়া CDMA"</item>
+    <item msgid="3160291725308400608">"শুধুমাত্র EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"গ্লোবাল"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"শুধুমাত্র TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"শুধুমাত্র NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"পছন্দের নেটওয়ার্ক মোড: WCDMA পছন্দসই"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র WCDMA"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 282b966..7438c7d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Συνδέθηκε"</string>
     <string name="network_connecting" msgid="160901383582774987">"Σύνδεση…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Αδυναμία σύνδεσης"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"Προτιμώνται GSM/WCDMA"</item>
+    <item msgid="5120532750027435355">"Μόνο GSM"</item>
+    <item msgid="8973311380798000102">"Μόνο WCDMA"</item>
+    <item msgid="4139961027147085705">"Αυτόματο GSM/WCDMA"</item>
+    <item msgid="4024581977690585814">"Αυτόματο EvDo/CDMA"</item>
+    <item msgid="7199560024080522581">"CDMA χωρίς EvDo"</item>
+    <item msgid="3160291725308400608">"Μόνο EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Γενικά"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"Μόνο TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Μόνο NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Προτιμώμενη λειτουργία δικτύου: προτιμώμενο WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Προτιμώμενη λειτουργία δικτύου: μόνο GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Προτιμώμενη λειτουργία δικτύου: μόνο WCDMA"</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 1174387..2dd18c6 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Konektatuta"</string>
     <string name="network_connecting" msgid="160901383582774987">"Konektatzen…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Ezin izan da konektatu"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA hobetsita"</item>
+    <item msgid="5120532750027435355">"GSM soilik"</item>
+    <item msgid="8973311380798000102">"WCDMA soilik"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA automatikoa"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo automatikoa"</item>
+    <item msgid="7199560024080522581">"EvDo gabeko CDMA"</item>
+    <item msgid="3160291725308400608">"EvDo soilik"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Orokorrak"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA soilik"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR soilik"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Sare modu hobetsia: WCDMA nahiago"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Sare modu hobetsia: GSM soilik"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Sare modu hobetsia: WCDMA soilik"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3cf6d50..a0a9116 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Connecté"</string>
     <string name="network_connecting" msgid="160901383582774987">"Connexion…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Connexion impossible"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA de préférence"</item>
+    <item msgid="5120532750027435355">"GSM uniquement"</item>
+    <item msgid="8973311380798000102">"WCDMA uniquement"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA automatique"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo automatique"</item>
+    <item msgid="7199560024080522581">"CDMA sans EvDo"</item>
+    <item msgid="3160291725308400608">"EvDo uniquement"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Général"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA uniquement"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR uniquement"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Mode réseau préféré : WCDMA de préférence"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Mode réseau préféré : GSM uniquement"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Mode réseau préféré : WCDMA uniquement"</string>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index d22d37b..d4c32d7 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Conectada"</string>
     <string name="network_connecting" msgid="160901383582774987">"Conectando…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Non se puido establecer conexión"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"Preferencia: GSM/WCDMA"</item>
+    <item msgid="5120532750027435355">"Só GSM"</item>
+    <item msgid="8973311380798000102">"Só WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA automático"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo automático"</item>
+    <item msgid="7199560024080522581">"CDMA sen EvDo"</item>
+    <item msgid="3160291725308400608">"Só EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA e LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Global"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"Só TD-SCDMA"</item>
+    <item msgid="611913646308951205">"TD-SCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TD-SCDMA"</item>
+    <item msgid="8506090627128783948">"TD-SCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TD-SCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TD-SCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TD-SCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TD-SCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Só NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Modo de rede preferido: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Modo de rede preferido: só GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Modo de rede preferido: só WCDMA"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d09277c..61b0a4a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"कनेक्ट है"</string>
     <string name="network_connecting" msgid="160901383582774987">"कनेक्ट हो रहा है..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"कनेक्ट नहीं हो सका"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA पसंदीदा"</item>
+    <item msgid="5120532750027435355">"केवल GSM"</item>
+    <item msgid="8973311380798000102">"केवल WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA ऑटो"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo ऑटो"</item>
+    <item msgid="7199560024080522581">"EvDo रहित CDMA"</item>
+    <item msgid="3160291725308400608">"केवल EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"ग्लोबल"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"केवल TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"सिर्फ़ NR मोड"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"पसंदीदा नेटवर्क मोड: WCDMA को प्राथमिकता"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"पसंदीदा नेटवर्क मोड: केवल GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"पसंदीदा नेटवर्क मोड: केवल WCDMA"</string>
@@ -452,7 +477,7 @@
     <string name="enter_pin_text" msgid="3182311451978663356">"सिम पिन:"</string>
     <string name="oldPinLabel" msgid="8618515202411987721">"पुराना पिन"</string>
     <string name="newPinLabel" msgid="3585899083055354732">"नया पिन"</string>
-    <string name="confirmPinLabel" msgid="7783531218662473778">"नए पिन की दुबारा पूछें"</string>
+    <string name="confirmPinLabel" msgid="7783531218662473778">"नए पिन की पुष्टि करें"</string>
     <string name="badPin" msgid="4549286285015892321">"  लिखा गया पुराना पिन सही नहीं है. फिर से प्रयास करें."</string>
     <string name="mismatchPin" msgid="1467254768290323845">"  लिखे गए पिन का मिलान नहीं होता. फिर से प्रयास करें."</string>
     <string name="invalidPin" msgid="7363723429414001979">"कोई ऐसा पिन लिखें, जिसमें 4 से 8 अंक हों."</string>
@@ -467,7 +492,7 @@
     <string name="enter_pin2_text" msgid="7266379426804295979">"पिन2"</string>
     <string name="oldPin2Label" msgid="4648543187859997203">"पुराना पिन2"</string>
     <string name="newPin2Label" msgid="1840905981784453939">"नया पिन2"</string>
-    <string name="confirmPin2Label" msgid="4336025914667593762">"नए पिन2 की दुबारा पूछें"</string>
+    <string name="confirmPin2Label" msgid="4336025914667593762">"नए पिन2 की पुष्टि करें"</string>
     <string name="badPuk2" msgid="6438182906645832235">"PUK2 गलत है. फिर से प्रयास करें."</string>
     <string name="badPin2" msgid="2760917538643074635">"पुराना PIN2  गलत है. फिर से प्रयास करें."</string>
     <string name="mismatchPin2" msgid="4952718725266700631">"PIN2 का मिलान नहीं हो रहा. फिर से प्रयास करें."</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 30a2e2b..b8cb5e5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Povezano"</string>
     <string name="network_connecting" msgid="160901383582774987">"Povezivanje..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Povezivanje nije uspjelo"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"Preporučeno: GSM/WCDMA"</item>
+    <item msgid="5120532750027435355">"Samo GSM"</item>
+    <item msgid="8973311380798000102">"Samo WCDMA"</item>
+    <item msgid="4139961027147085705">"Automatski GSM/WCDMA"</item>
+    <item msgid="4024581977690585814">"Automatski CDMA/EvDo"</item>
+    <item msgid="7199560024080522581">"CDMA bez EvDo-a"</item>
+    <item msgid="3160291725308400608">"Samo EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Globalno"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"Samo TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Samo NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Način željene mreže: Preferirano WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Način željene mreže: Samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Način željene mreže: Samo WCDMA"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 093f728..0708f13 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Terhubung"</string>
     <string name="network_connecting" msgid="160901383582774987">"Menyambungkan..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Tidak dapat tersambung"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA lebih disukai"</item>
+    <item msgid="5120532750027435355">"GSM saja"</item>
+    <item msgid="8973311380798000102">"Hanya WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA otomatis"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo otomatis"</item>
+    <item msgid="7199560024080522581">"CDMA tanpa EvDo"</item>
+    <item msgid="3160291725308400608">"EvDo saja"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Global"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"Hanya TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Khusus NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Mode jaringan pilihan: WCDMA lebih disukai"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Mode jaringan pilihan: GSM saja"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Mode jaringan pilihan: WCDMA saja"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index bed8377..ac50de8 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Connesso"</string>
     <string name="network_connecting" msgid="160901383582774987">"Connessione…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Impossibile connettersi."</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA preferito"</item>
+    <item msgid="5120532750027435355">"Solo GSM"</item>
+    <item msgid="8973311380798000102">"Solo WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA automatico"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo automatico"</item>
+    <item msgid="7199560024080522581">"CDMA senza EvDo"</item>
+    <item msgid="3160291725308400608">"Solo EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Globale"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"Solo TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Solo NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Modalità di rete preferita: WCDMA (preferita)"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Modalità di rete preferita: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Modalità di rete preferita: solo WCDMA"</string>

diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index e3a7bdf..afd2bf6 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"დაკავშირებულია"</string>
     <string name="network_connecting" msgid="160901383582774987">"უკავშირდება..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"ვერ დაუკავშირდა"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA უპირატესობით"</item>
+    <item msgid="5120532750027435355">"მხოლოდ GSM"</item>
+    <item msgid="8973311380798000102">"მხოლოდ WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA ავტო"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo ავტო"</item>
+    <item msgid="7199560024080522581">"CDMA, EvDo-ის გარეშე"</item>
+    <item msgid="3160291725308400608">"მხოლოდ EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"გლობალური"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"მხოლოდ TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"მხოლოდ NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"ქსელის სასურველი რეჟიმი: WCDMA უპირატესობა"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"ქსელის სასურველი რეჟიმი: მხოლოდ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"ქსელის სასურველი რეჟიმი: WCDMA მხოლოდ"</string>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 621f068..391df8c 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Қосылды"</string>
     <string name="network_connecting" msgid="160901383582774987">"Қосылуда…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Қосылмады"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA таңдалған"</item>
+    <item msgid="5120532750027435355">"Тек қана GSM"</item>
+    <item msgid="8973311380798000102">"Тек қана WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA (aвтоматты)"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo (автоматты)"</item>
+    <item msgid="7199560024080522581">"EvDo-сыз CDMA"</item>
+    <item msgid="3160291725308400608">"EvDo ғана"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Жалпы"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"Тек қана TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Тек NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Қалаулы желі режимі: WCDMA таңдалды"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Қалаулы желі режимі: GSM ғана"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Қалаулы желі режимі: WCDMA ғана"</string>

diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index db6f5fc..efb1a86 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
     <string name="network_connecting" msgid="160901383582774987">"ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</item>
+    <item msgid="5120532750027435355">"GSM ಮಾತ್ರ"</item>
+    <item msgid="8973311380798000102">"WCDMA ಮಾತ್ರ"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA  ಸ್ವಯಂ"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo ಸ್ವಯಂ"</item>
+    <item msgid="7199560024080522581">"EvDo ಇಲ್ಲದೆ CDMA"</item>
+    <item msgid="3160291725308400608">"EvDo ಮಾತ್ರ"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"ಜಾಗತಿಕ"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA ಮಾತ್ರ"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR ಮಾತ್ರ"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"ಬಯಸಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌: WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"ಬಯಸಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌‌: GSM ಮಾತ್ರ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"ಬಯಸಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌: WCDMA ಮಾತ್ರ"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 221af76..b7856e2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"연결됨"</string>
     <string name="network_connecting" msgid="160901383582774987">"연결 중..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"연결할 수 없음"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA로 기본 설정"</item>
+    <item msgid="5120532750027435355">"GSM 전용"</item>
+    <item msgid="8973311380798000102">"WCDMA 전용"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA 자동"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo 자동"</item>
+    <item msgid="7199560024080522581">"CDMA(EvDo 없음)"</item>
+    <item msgid="3160291725308400608">"EvDo 전용"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA+LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"글로벌"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA 전용"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR 전용"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"기본 네트워크 모드: WCDMA 선호"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"기본 네트워크 모드: GSM 전용"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"기본 네트워크 모드: WCDMA 전용"</string>

diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 6265ae6..8eaeb13 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"കണക്‌റ്റ് ചെയ്‌തു"</string>
     <string name="network_connecting" msgid="160901383582774987">"കണക്‌റ്റ് ചെയ്യുന്നു..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"കണക്റ്റ് ചെയ്യാനായില്ല"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA തിരഞ്ഞെടുത്തത്"</item>
+    <item msgid="5120532750027435355">"GSM മാത്രം"</item>
+    <item msgid="8973311380798000102">"WCDMA മാത്രം"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA യാന്ത്രികം"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo യാന്ത്രികം"</item>
+    <item msgid="7199560024080522581">"EvDo ഇല്ലാത്ത CDMA"</item>
+    <item msgid="3160291725308400608">"EvDo മാത്രം"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"ആഗോളം"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA മാത്രം"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR മാത്രം"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് മോഡ്: WCDMA തിരഞ്ഞെടുത്തു"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് മോഡ്: GSM മാത്രം"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് മോഡ്: WCDMA മാത്രം"</string>

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 9475f4d..90bc907 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"कनेक्ट केले"</string>
     <string name="network_connecting" msgid="160901383582774987">"कनेक्ट होत आहे..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"कनेक्ट करता आले नाही"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA प्राधान्‍यकृत"</item>
+    <item msgid="5120532750027435355">"केवळ GSM"</item>
+    <item msgid="8973311380798000102">"फक्त WCDMA"</item>
+    <item msgid="4139961027147085705">"आपोआप GSM/WCDMA"</item>
+    <item msgid="4024581977690585814">"आपोआप CDMA/EvDo"</item>
+    <item msgid="7199560024080522581">"CDMA w/o EvDo"</item>
+    <item msgid="3160291725308400608">"केवळ EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"जागतिक"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"फक्त TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"फक्त NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"प्राधान्‍यकृत नेटवर्क मोड: WCDMA प्राधान्‍यकृत"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"प्राधान्‍यकृत नेटवर्क मोड: केवळ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"प्राधान्‍यकृत नेटवर्क प्रकार: केवळ WCDMA"</string>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 52fc003..032ebad 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"ချိတ်ဆက်ထားပါသည်"</string>
     <string name="network_connecting" msgid="160901383582774987">"ချိတ်ဆက်နေသည်..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"ချိတ်ဆက်၍ မရပါ"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA သုံးလိုပါသည်"</item>
+    <item msgid="5120532750027435355">"GSM သာ"</item>
+    <item msgid="8973311380798000102">"WCDMA သာ"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA အလိုအလျောက်ပြောင်းရန်"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo အလိုအလျောက်ပြောင်းရန်"</item>
+    <item msgid="7199560024080522581">"EvDo မပါသည့် CDMA"</item>
+    <item msgid="3160291725308400608">"EvDo သာ"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"ကမ္ဘာအနှံ့"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA သာ"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR သီးသန့်"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"ပိုမိုကြိုက်သော ကွန်ယက်စနစ်-WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"ပိုမိုကြိုက်သော ကွန်ယက်စနစ်-GSM သာ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"ပိုမိုကြိုက်သော ကွန်ယက်စနစ်- WCDMA သာ"</string>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index dd5b01e..b1a824e 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"जडान गरियो"</string>
     <string name="network_connecting" msgid="160901383582774987">"जडान गरिँदै छ..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"जडान गर्न सकिएन"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA रुचाइयो"</item>
+    <item msgid="5120532750027435355">"GSM मात्र"</item>
+    <item msgid="8973311380798000102">"WCDMA मात्र"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA स्वतः"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo स्वतः"</item>
+    <item msgid="7199560024080522581">"CDMA w/o EvDo"</item>
+    <item msgid="3160291725308400608">"केवल EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"विश्वव्यापी"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA मात्र"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR मात्र"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"रुचाइएको नेटवर्क मोड: WCDMA रुचाइएको"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"रुचाइएको नेटवर्क मोड: GSM मात्र"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"रुचाइएको नेटवर्क मोड: WCDMA मात्र"</string>

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 7774d43..abc9e30 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"କନେନ୍ଟ ହୋ‌ଇଛି"</string>
     <string name="network_connecting" msgid="160901383582774987">"କନେନ୍ଟ ହେଉଛି..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"କନେକ୍ଟ କରିହେଲା ନାହିଁ"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"ନିଜ ପସନ୍ଦର GSM/WCDMA"</item>
+    <item msgid="5120532750027435355">"କେବଳ GSM"</item>
+    <item msgid="8973311380798000102">"କେବଳ WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA ଅଟୋ"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo ଅଟୋ"</item>
+    <item msgid="7199560024080522581">"CDMA ବିନା EvDo"</item>
+    <item msgid="3160291725308400608">"କେବଳ EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"ଗ୍ଲୋବାଲ୍"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"କେବଳ TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"କେବଳ NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"ନିଜ ପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: WCDMAକୁ ପସନ୍ଦ କରାଯାଇଛି"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"ନିଜ ପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: କେବଳ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"ନିଜ ପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: କେବଳ WCDMA"</string>

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 4175419..8ae1508 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"ਕਨੈਕਟ ਹੋਇਆ"</string>
     <string name="network_connecting" msgid="160901383582774987">"ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA ਤਰਜੀਹੀ"</item>
+    <item msgid="5120532750027435355">"ਸਿਰਫ਼ GSM"</item>
+    <item msgid="8973311380798000102">"ਸਿਰਫ਼ WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA ਸਵੈਚਲਿਤ"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo ਸਵੈਚਲਿਤ"</item>
+    <item msgid="7199560024080522581">"CDMA w/o EvDo"</item>
+    <item msgid="3160291725308400608">"ਕੇਵਲ EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"ਗਲੋਬਲ"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"ਸਿਰਫ਼ TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"ਸਿਰਫ਼ NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"ਤਰਜੀਹੀ ਨੈਟਵਰਕ ਮੋਡ: ਤਰਜੀਹੀ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"ਤਰਜੀਹੀ ਨੈਟਵਰਕ ਮੋਡ: ਕੇਵਲ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"ਤਰਜੀਹੀ ਨੈਟਵਰਕ ਮੋਡ: ਕੇਵਲ WCDMA"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a3cdb3a..20a0cf5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Подключено"</string>
     <string name="network_connecting" msgid="160901383582774987">"Подключение…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Не удалось подключиться к сети"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA (предпочтительный режим)"</item>
+    <item msgid="5120532750027435355">"Только GSM"</item>
+    <item msgid="8973311380798000102">"Только WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA (авторежим)"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo (авторежим)"</item>
+    <item msgid="7199560024080522581">"CDMA без EvDo"</item>
+    <item msgid="3160291725308400608">"Только EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA и LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Весь мир"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"Только TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Только NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Предпочтительная сеть: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Предпочтительная сеть: только GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Предпочтительная сеть: только WCDMA"</string>

diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index f4d963c..bb6543b 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Lidhur"</string>
     <string name="network_connecting" msgid="160901383582774987">"Po lidhet..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Nuk mund të lidhej"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA i preferuar"</item>
+    <item msgid="5120532750027435355">"Vetëm GSM"</item>
+    <item msgid="8973311380798000102">"Vetëm WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA automatik"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo automatik"</item>
+    <item msgid="7199560024080522581">"CDMA pa EvDo"</item>
+    <item msgid="3160291725308400608">"Vetëm EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Globale"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"Vetëm TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Vetëm NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Modaliteti i preferuar i rrjetit: preferohet WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Modaliteti i preferuar i rrjetit: vetëm GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Modaliteti i preferuar i rrjetit: vetëm WCDMA"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9a16507..4421f1c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Imeunganishwa"</string>
     <string name="network_connecting" msgid="160901383582774987">"Inaunganisha..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Imeshindwa kuunganisha"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA inapendelewa"</item>
+    <item msgid="5120532750027435355">"GSM pekee"</item>
+    <item msgid="8973311380798000102">"WCDMA pekee"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA otomatiki"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo otomatiki"</item>
+    <item msgid="7199560024080522581">"CDMA w/o EvDo"</item>
+    <item msgid="3160291725308400608">"EvDo pekee"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Jumla"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA pekee"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR pekee"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Modi pendekezwa ya mtandao: WCDMA pendekezwa"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Modi pendekezwa ya mtandao: GSM  pekee"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Modi pendekezwa ya mtandao: WCDMA pekee"</string>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 3f6937e..4737692 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"இணைக்கப்பட்டது"</string>
     <string name="network_connecting" msgid="160901383582774987">"இணைக்கிறது..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"இணைக்க முடியவில்லை"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMAக்கு முன்னுரிமை"</item>
+    <item msgid="5120532750027435355">"GSM மட்டும்"</item>
+    <item msgid="8973311380798000102">"WCDMA மட்டும்"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA தானியங்கு"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo தானியங்கு"</item>
+    <item msgid="7199560024080522581">"CDMA w/o EvDo"</item>
+    <item msgid="3160291725308400608">"EvDo மட்டும்"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"குளோபல்"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA மட்டும்"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR மட்டும்"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"தேர்ந்தெடுத்த நெட்வொர்க் பயன்முறை: WCDMA பரிந்துரைக்கப்படுகிறது"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"தேர்ந்தெடுத்த நெட்வொர்க் பயன்முறை: GSM மட்டும்"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"தேர்ந்தெடுத்த நெட்வொர்க் பயன்முறை: WCDMA மட்டும்"</string>

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 46a7bd9..f4fc4d4 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"కనెక్ట్ చేయబడింది"</string>
     <string name="network_connecting" msgid="160901383582774987">"కనెక్ట్ అవుతోంది..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"కనెక్ట్ చేయడం సాధ్యపడలేదు"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMAకు ప్రాధాన్యత"</item>
+    <item msgid="5120532750027435355">"GSM మాత్రమే"</item>
+    <item msgid="8973311380798000102">"WCDMA మాత్రమే"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA స్వయంచాలకం"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo స్వయంచాలకం"</item>
+    <item msgid="7199560024080522581">"EvDo లేని CDMA"</item>
+    <item msgid="3160291725308400608">"EvDo మాత్రమే"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"సార్వజనీన"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE / WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA మాత్రమే"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR మాత్రమే"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"ప్రాధాన్య నెట్‌వర్క్ మోడ్: WCDMAకు ప్రాధాన్యత"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"ప్రాధాన్య నెట్‌వర్క్ మోడ్: GSM మాత్రమే"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"ప్రాధాన్య నెట్‌వర్క్ మోడ్: WCDMA మాత్రమే"</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f230125..ef3a51d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"เชื่อมต่อแล้ว"</string>
     <string name="network_connecting" msgid="160901383582774987">"กำลังเชื่อมต่อ..."</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"เชื่อมต่อไม่ได้"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"ต้องการ GSM/WCDMA"</item>
+    <item msgid="5120532750027435355">"GSM เท่านั้น"</item>
+    <item msgid="8973311380798000102">"WCDMA เท่านั้น"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA อัตโนมัติ"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo อัตโนมัติ"</item>
+    <item msgid="7199560024080522581">"CDMA ที่ไม่มี EvDo"</item>
+    <item msgid="3160291725308400608">"EvDo เท่านั้น"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"ทั่วไป"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"TDSCDMA เท่านั้น"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"NR เท่านั้น"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"โหมดเครือข่ายที่ต้องการ: ต้องการ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"โหมดเครือข่ายที่ต้องการ: GSM เท่านั้น"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"โหมดเครือข่ายที่ต้องการ: WCDMA เท่านั้น"</string>

diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 9816c9c..d2523da 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"Ulandi"</string>
     <string name="network_connecting" msgid="160901383582774987">"Ulanmoqda…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"Tarmoqqa ulanmadi"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA (tavsiya qilinadi)"</item>
+    <item msgid="5120532750027435355">"Faqat GSM"</item>
+    <item msgid="8973311380798000102">"Faqat WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA (avtorejim)"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo (avtorejim)"</item>
+    <item msgid="7199560024080522581">"CDMA (EvDo’siz)"</item>
+    <item msgid="3160291725308400608">"Faqat EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA va LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"Jahon"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"Faqat TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"Faqat NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"Tanlangan tarmoq rejimi: WCDMA tanlangan"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"Tanlangan tarmoq rejimi: faqat GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"Tanlangan tarmoq rejimi: faqat WCDMA"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 76c6c3e..caa130d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"已连接"</string>
     <string name="network_connecting" msgid="160901383582774987">"正在连接…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"无法连接"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"首选 GSM/WCDMA"</item>
+    <item msgid="5120532750027435355">"仅限 GSM"</item>
+    <item msgid="8973311380798000102">"仅限 WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA 自动选择"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo 自动选择"</item>
+    <item msgid="7199560024080522581">"CDMA，无 EvDo 功能"</item>
+    <item msgid="3160291725308400608">"仅 EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"通用"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"仅限 TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"仅限 NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"首选网络模式：首选 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"首选网络模式：仅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"首选网络模式：仅限 WCDMA"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2b4b47c..2d911d4 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -187,17 +187,42 @@
     <string name="network_connected" msgid="2760235679963580224">"已連線"</string>
     <string name="network_connecting" msgid="160901383582774987">"連線中…"</string>
     <string name="network_could_not_connect" msgid="6547460848093727998">"無法連線"</string>
-    <!-- no translation found for preferred_network_mode_choices:23 (4738087170533378966) -->
-    <!-- no translation found for preferred_network_mode_choices:24 (2935877729588775187) -->
-    <!-- no translation found for preferred_network_mode_choices:25 (8967513231424970529) -->
-    <!-- no translation found for preferred_network_mode_choices:26 (1542643426479755015) -->
-    <!-- no translation found for preferred_network_mode_choices:27 (5778162260258129841) -->
-    <!-- no translation found for preferred_network_mode_choices:28 (8088614845214545367) -->
-    <!-- no translation found for preferred_network_mode_choices:29 (6517428040626326776) -->
-    <!-- no translation found for preferred_network_mode_choices:30 (5294150161567170165) -->
-    <!-- no translation found for preferred_network_mode_choices:31 (4130965694947056705) -->
-    <!-- no translation found for preferred_network_mode_choices:32 (3869566732842046032) -->
-    <!-- no translation found for preferred_network_mode_choices:33 (3942770927563146543) -->
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="4531933377509551889">"GSM/WCDMA 優先"</item>
+    <item msgid="5120532750027435355">"僅限 GSM"</item>
+    <item msgid="8973311380798000102">"僅限 WCDMA"</item>
+    <item msgid="4139961027147085705">"GSM/WCDMA 自動切換"</item>
+    <item msgid="4024581977690585814">"CDMA/EvDo 自動切換"</item>
+    <item msgid="7199560024080522581">"CDMA (不具 EvDo)"</item>
+    <item msgid="3160291725308400608">"僅限 EvDo"</item>
+    <item msgid="2319217472852426965">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="7342827148550261533">"CDMA + LTE/EvDo"</item>
+    <item msgid="1694517610683571748">"GSM/WCDMA/LTE"</item>
+    <item msgid="2431844716050955858">"通用"</item>
+    <item msgid="8522859526931346931">"LTE"</item>
+    <item msgid="7852977970279215000">"LTE/WCDMA"</item>
+    <item msgid="5779210256161024981">"僅限 TDSCDMA"</item>
+    <item msgid="611913646308951205">"TDSCDMA/WCDMA"</item>
+    <item msgid="1738977207573340604">"LTE/TDSCDMA"</item>
+    <item msgid="8506090627128783948">"TDSCDMA/GSM"</item>
+    <item msgid="8818474033583337353">"LTE/TDSCDMA/GSM"</item>
+    <item msgid="3102297933672336483">"TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3802189736321382954">"LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="6147699530135006312">"LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="8826479449402151312">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="6284311629324843506">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+    <item msgid="4738087170533378966">"僅使用 NR"</item>
+    <item msgid="2935877729588775187">"NR/LTE"</item>
+    <item msgid="8967513231424970529">"NR/LTE/CDMA/EvDo"</item>
+    <item msgid="1542643426479755015">"NR/LTE/GSM/WCDMA"</item>
+    <item msgid="5778162260258129841">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8088614845214545367">"NR/LTE/WCDMA"</item>
+    <item msgid="6517428040626326776">"NR/LTE/TDSCDMA"</item>
+    <item msgid="5294150161567170165">"NR/LTE/TDSCDMA/GSM"</item>
+    <item msgid="4130965694947056705">"NR/LTE/TDSCDMA/WCDMA"</item>
+    <item msgid="3869566732842046032">"NR/LTE/TDSCDMA/GSM/WCDMA"</item>
+    <item msgid="3942770927563146543">"NR/LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+  </string-array>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="7851493369130750126">"慣用網路模式：偏好 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="4323367929994392830">"慣用網路模式：僅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="3585482191951442207">"慣用網路模式：僅限 WCDMA"</string>

diff --git a/sip/res/values-iw/strings.xml b/sip/res/values-iw/strings.xml
index 6964365..6e84560 100644
--- a/sip/res/values-iw/strings.xml
+++ b/sip/res/values-iw/strings.xml

@@ -27,7 +27,7 @@
     <string name="sip_call_options_entry_2" msgid="7338504256051655013">"‏עבור שיחות SIP בלבד"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="922329055414010991">"לכל השיחות"</string>
     <string name="add_sip_account" msgid="5754758646745144384">"חשבון חדש"</string>
-    <string name="remove_sip_account" msgid="8272617403399636513">"הסר חשבון"</string>
+    <string name="remove_sip_account" msgid="8272617403399636513">"הסרת חשבון"</string>
     <string name="sip_account_list" msgid="2596262496233721769">"‏חשבונות SIP"</string>
     <string name="saving_account" msgid="3390358043846687266">"שומר את החשבון..."</string>
     <string name="removing_account" msgid="1544132880414780408">"מסיר את החשבון..."</string>

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 267b116..c8ff261 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java

@@ -1529,29 +1529,16 @@
         }
     }
 
-    public boolean supplyPin(String pin) {
-        return supplyPinForSubscriber(getDefaultSubscription(), pin);
-    }
-
     public boolean supplyPinForSubscriber(int subId, String pin) {
         int [] resultArray = supplyPinReportResultForSubscriber(subId, pin);
         return (resultArray[0] == PhoneConstants.PIN_RESULT_SUCCESS) ? true : false;
     }
 
-    public boolean supplyPuk(String puk, String pin) {
-        return supplyPukForSubscriber(getDefaultSubscription(), puk, pin);
-    }
-
     public boolean supplyPukForSubscriber(int subId, String puk, String pin) {
         int [] resultArray = supplyPukReportResultForSubscriber(subId, puk, pin);
         return (resultArray[0] == PhoneConstants.PIN_RESULT_SUCCESS) ? true : false;
     }
 
-    /** {@hide} */
-    public int[] supplyPinReportResult(String pin) {
-        return supplyPinReportResultForSubscriber(getDefaultSubscription(), pin);
-    }
-
     public int[] supplyPinReportResultForSubscriber(int subId, String pin) {
         enforceModifyPermission();
 
@@ -1565,11 +1552,6 @@
         }
     }
 
-    /** {@hide} */
-    public int[] supplyPukReportResult(String puk, String pin) {
-        return supplyPukReportResultForSubscriber(getDefaultSubscription(), puk, pin);
-    }
-
     public int[] supplyPukReportResultForSubscriber(int subId, String puk, String pin) {
         enforceModifyPermission();
 
@@ -6866,7 +6848,8 @@
 
     @Override
     public boolean isManualNetworkSelectionAllowed(int subId) {
-        TelephonyPermissions.enforeceCallingOrSelfReadPhoneStatePermissionOrCarrierPrivilege(
+        TelephonyPermissions
+                .enforeceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
                 mApp, subId, "isManualNetworkSelectionAllowed");
 
         boolean isAllowed = true;
@@ -7592,7 +7575,7 @@
      *  1) user data is turned on, or
      *  2) APN is un-metered for this subscription, or
      *  3) APN type is whitelisted. E.g. MMS is whitelisted if
-     *  {@link SubscriptionManager#setAlwaysAllowMmsData} is turned on.
+     *  {@link TelephonyManager#setAlwaysAllowMmsData} is turned on.
      *
      * @return whether data is allowed for a apn type.
      *
@@ -7716,6 +7699,22 @@
         }
     }
 
+    @Override
+    public boolean setAlwaysAllowMmsData(int subId, boolean alwaysAllow) {
+        enforceModifyPermission();
+
+        // Now that all security checks passes, perform the operation as ourselves.
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            Phone phone = getPhone(subId);
+            if (phone == null) return false;
+
+            return phone.getDataEnabledSettings().setAlwaysAllowMmsData(alwaysAllow);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
     /**
      * Updates whether conference event pacakge handling is enabled.
      * @param isCepEnabled {@code true} if CEP handling is enabled (default), or {@code false}

diff --git a/src/com/android/services/telephony/RadioOnHelper.java b/src/com/android/services/telephony/RadioOnHelper.java
index 981dc96..116c61d 100644
--- a/src/com/android/services/telephony/RadioOnHelper.java
+++ b/src/com/android/services/telephony/RadioOnHelper.java

@@ -110,6 +110,11 @@
             Settings.Global.putInt(mContext.getContentResolver(),
                     Settings.Global.AIRPLANE_MODE_ON, 0);
 
+            for (Phone phone : PhoneFactory.getPhones()) {
+                Log.d(this, "powerOnRadio, enabling Radio");
+                phone.setRadioPower(true);
+            }
+
             // Post the broadcast intend for change in airplane mode
             // TODO: We really should not be in charge of sending this broadcast.
             // If changing the setting is sufficient to trigger all of the rest of the logic,

diff --git a/src/com/android/services/telephony/RadioOnStateListener.java b/src/com/android/services/telephony/RadioOnStateListener.java
index 52bd9cf..43269b4 100644
--- a/src/com/android/services/telephony/RadioOnStateListener.java
+++ b/src/com/android/services/telephony/RadioOnStateListener.java

@@ -56,6 +56,9 @@
     @VisibleForTesting
     public static final int MSG_SERVICE_STATE_CHANGED = 2;
     private static final int MSG_RETRY_TIMEOUT = 3;
+    @VisibleForTesting
+    public static final int MSG_RADIO_ON = 4;
+    public static final int MSG_RADIO_OFF_OR_NOT_AVAILABLE = 5;
 
     private final Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
@@ -75,6 +78,12 @@
                 case MSG_SERVICE_STATE_CHANGED:
                     onServiceStateChanged((ServiceState) ((AsyncResult) msg.obj).result);
                     break;
+                case MSG_RADIO_ON:
+                    onRadioOn();
+                    break;
+                case MSG_RADIO_OFF_OR_NOT_AVAILABLE:
+                    registerForRadioOn();
+                    break;
                 case MSG_RETRY_TIMEOUT:
                     onRetryTimeout();
                     break;
@@ -135,6 +144,9 @@
         mCallback = callback;
 
         registerForServiceStateChanged();
+        // Register for RADIO_OFF to handle cases where emergency call is dialed before
+        // we receive UNSOL_RESPONSE_RADIO_STATE_CHANGED with RADIO_OFF.
+        registerForRadioOff();
         // Next step: when the SERVICE_STATE_CHANGED event comes in, we'll retry the call; see
         // onServiceStateChanged(). But also, just in case, start a timer to make sure we'll retry
         // the call even if the SERVICE_STATE_CHANGED event never comes in for some reason.
@@ -169,6 +181,17 @@
         }
     }
 
+    private void onRadioOn() {
+        ServiceState state =  mPhone.getServiceState();
+        Log.d(this, "onRadioOn, state = %s, Phone = %s", state,
+                mPhone.getPhoneId());
+        if (isOkToCall(state.getState())) {
+            onComplete(true);
+            cleanup();
+        } else {
+            Log.d(this, "onRadioOn: not ready to call yet, keep waiting.");
+        }
+    }
     /**
      * Callback to see if it is okay to call yet, given the current conditions.
      */
@@ -239,6 +262,8 @@
         onComplete(false);
 
         unregisterForServiceStateChanged();
+        unregisterForRadioOff();
+        unregisterForRadioOn();
         cancelRetryTimer();
 
         // Used for unregisterForServiceStateChanged() so we null it out here instead.
@@ -271,6 +296,31 @@
         mHandler.removeMessages(MSG_SERVICE_STATE_CHANGED);  // Clean up any pending messages too
     }
 
+    private void registerForRadioOff() {
+        mPhone.mCi.registerForOffOrNotAvailable(mHandler, MSG_RADIO_OFF_OR_NOT_AVAILABLE, null);
+    }
+
+    private void unregisterForRadioOff() {
+        // This method is safe to call even if we haven't set mPhone yet.
+        if (mPhone != null) {
+            mPhone.mCi.unregisterForOffOrNotAvailable(mHandler);  // Safe even if unnecessary
+        }
+        mHandler.removeMessages(MSG_RADIO_OFF_OR_NOT_AVAILABLE);  // Clean up any pending messages
+    }
+
+    private void registerForRadioOn() {
+        unregisterForRadioOff();
+        mPhone.mCi.registerForOn(mHandler, MSG_RADIO_ON, null);
+    }
+
+    private void unregisterForRadioOn() {
+        // This method is safe to call even if we haven't set mPhone yet.
+        if (mPhone != null) {
+            mPhone.mCi.unregisterForOn(mHandler);  // Safe even if unnecessary
+        }
+        mHandler.removeMessages(MSG_RADIO_ON);  // Clean up any pending messages too
+    }
+
     private void onComplete(boolean isRadioReady) {
         if (mCallback != null) {
             Callback tempCallback = mCallback;

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 79befd8..ac3827f 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java

@@ -662,7 +662,7 @@
                         // been powered on and isn't in the UNAVAILABLE state, even if it is
                         // reporting the OUT_OF_SERVICE state.
                         return (phone.getState() == PhoneConstants.State.OFFHOOK)
-                            || phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
+                            || phone.getServiceStateTracker().isRadioOn();
                     } else {
                         // Wait until we are in service and ready to make calls. This can happen
                         // when we power down the radio on bluetooth to save power on watches or if

diff --git a/tests/src/com/android/services/telephony/RadioOnStateListenerTest.java b/tests/src/com/android/services/telephony/RadioOnStateListenerTest.java
index 8b46bf0..afdfab5 100644
--- a/tests/src/com/android/services/telephony/RadioOnStateListenerTest.java
+++ b/tests/src/com/android/services/telephony/RadioOnStateListenerTest.java

@@ -34,6 +34,7 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.TelephonyTestBase;
+import com.android.internal.telephony.CommandsInterface;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 
@@ -55,6 +56,7 @@
 
     @Mock Phone mMockPhone;
     @Mock RadioOnStateListener.Callback mCallback;
+    @Mock CommandsInterface mMockCi;
     RadioOnStateListener mListener;
 
     @Override
@@ -80,6 +82,7 @@
     @Test
     @SmallTest
     public void testRegisterForCallback() {
+        mMockPhone.mCi = mMockCi;
         mListener.waitForRadioOn(mMockPhone, mCallback);
 
         waitForHandlerAction(mListener.getHandler(), TIMEOUT_MS);
@@ -87,6 +90,9 @@
         verify(mMockPhone).unregisterForServiceStateChanged(any(Handler.class));
         verify(mMockPhone).registerForServiceStateChanged(any(Handler.class),
                 eq(RadioOnStateListener.MSG_SERVICE_STATE_CHANGED), isNull());
+
+        verify(mMockCi).registerForOffOrNotAvailable(any(Handler.class),
+                eq(RadioOnStateListener.MSG_RADIO_OFF_OR_NOT_AVAILABLE), isNull());
     }
 
     /**
@@ -101,6 +107,7 @@
         state.setState(ServiceState.STATE_IN_SERVICE);
         when(mMockPhone.getState()).thenReturn(PhoneConstants.State.IDLE);
         when(mCallback.isOkToCall(eq(mMockPhone), anyInt())).thenReturn(true);
+        mMockPhone.mCi = mMockCi;
         mListener.waitForRadioOn(mMockPhone, mCallback);
         waitForHandlerAction(mListener.getHandler(), TIMEOUT_MS);
 
@@ -124,6 +131,7 @@
         when(mMockPhone.getState()).thenReturn(PhoneConstants.State.IDLE);
         when(mCallback.isOkToCall(eq(mMockPhone), anyInt())).thenReturn(false);
         when(mMockPhone.getServiceState()).thenReturn(state);
+        mMockPhone.mCi = mMockCi;
         mListener.waitForRadioOn(mMockPhone, mCallback);
         waitForHandlerAction(mListener.getHandler(), TIMEOUT_MS);
 
@@ -152,6 +160,7 @@
         mListener.setMaxNumRetries(2);
 
         // Wait for the timer to expire and check state manually in onRetryTimeout
+        mMockPhone.mCi = mMockCi;
         mListener.waitForRadioOn(mMockPhone, mCallback);
         waitForHandlerActionDelayed(mListener.getHandler(), TIMEOUT_MS, TIMEOUT_MS /*delay*/);
commit	cd4fa8c67fb7af4ed714abd2187b764e23bd8781	[log] [tgz]
author	Shuo Qian <shuoq@google.com>	Tue Jan 07 21:27:31 2020 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Jan 07 21:27:31 2020 +0000
tree	1d7d51ef5cc6e68c2a24920466a3ec74425bda25
parent	3a139b22b5a35d4fa39ed305eae871408ebc9fca [diff]
parent	dfc85889300e8014cc4fec703a308f89ceee5ebe [diff]