Merge "Re-add VM: Do not do full sync more than once within a 1 minute span."
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 0a2308c..16082ae 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -313,7 +313,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (aanbeveel)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (aanbeveel)"</string>
<string name="network_global" msgid="1323190488685355309">"Globaal"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Net TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Stelselkeuse"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Verander die CDMA-swerfmodus"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Stelselkeuse"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ada5f57..ef996a9 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (የሚመከር)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (የሚመከር)"</string>
<string name="network_global" msgid="1323190488685355309">"አለምአቀፍ"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA ብቻ"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"የሥርዓት ምርጫ"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"የCDMA በእንቅስቃሴ ላይ ሁኔታ ለውጥ"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"የሥርዓት ምርጫ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fabc419..32e1e25 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (مستحسن)"</string>
<string name="network_4G" msgid="2723512640529983138">"الجيل الرابع (مستحسن)"</string>
<string name="network_global" msgid="1323190488685355309">"عام"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA فقط"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"تحديد النظام"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"تغيير وضع التجوال عبر CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"تحديد النظام"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 1b3b158..3f6c894 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (məsləhətlidir)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (məsləhətlidir)"</string>
<string name="network_global" msgid="1323190488685355309">"Qlobal"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Yalnız TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sistem seçin"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA rouminq rejimini dəyişin"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistem seçin"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c2d3252..84bee9e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (препоръчително)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (препоръчително)"</string>
<string name="network_global" msgid="1323190488685355309">"Глобална"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Само TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Избор на система"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Промяна на режима на роуминг на CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Избор на система"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index c80a9e8..fd3b8d7 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (প্রস্তাবিত)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (প্রস্তাবিত)"</string>
<string name="network_global" msgid="1323190488685355309">"বিশ্বব্যাপী"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"শুধুমাত্র TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"সিস্টেম নির্বাচন"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA রোমিং মোডটির পরিবর্তন করুন"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"সিস্টেম নির্বাচন"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5f72e20..c6ced01 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (opció recomanada)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (opció recomanada)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Només TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Selecció del sistema"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Canvia el mode d\'itinerància CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selecció del sistema"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 04d0f02..6ebb4c1 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (doporučeno)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (doporučeno)"</string>
<string name="network_global" msgid="1323190488685355309">"Globální"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Pouze TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Výběr systému"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Změnit režim roamingu CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Výběr systému"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b02e1d4..85f4bf2 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -17,9 +17,9 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobildata"</string>
- <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Telefontjenester"</string>
+ <string name="phoneAppLabel" product="default" msgid="6790717591729922998">"Opkaldstjenester"</string>
<string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Nødopkald"</string>
- <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
+ <string name="phoneIconLabel" msgid="2331230813161304895">"Opkald"</string>
<string name="fdnListLabel" msgid="8630418672279521003">"Liste over numre til begrænset opkald"</string>
<string name="unknown" msgid="6878797917991465859">"Ukendt"</string>
<string name="private_num" msgid="6713286113000232309">"Privat nummer"</string>
@@ -128,7 +128,7 @@
<string name="stk_cc_ss_to_dial_error" msgid="2816779198916570502">"SS-anmodningen blev ændret til en DIAL-anmodning."</string>
<string name="stk_cc_ss_to_ussd_error" msgid="7490626178582654236">"SS-anmodningen blev ændret til en USSD-anmodning."</string>
<string name="stk_cc_ss_to_ss_error" msgid="5057846756489053759">"SS-anmodningen blev ændret til en ny SS-anmodning."</string>
- <string name="fdn_check_failure" msgid="18200614306525434">"Indstillingen Begrænset opkald i appen Telefon er aktiveret. Derfor fungerer nogle opkaldsfunktioner ikke."</string>
+ <string name="fdn_check_failure" msgid="18200614306525434">"Indstillingen Begrænset opkald i appen Opkald er aktiveret. Derfor fungerer nogle opkaldsfunktioner ikke."</string>
<string name="radio_off_error" msgid="2304459933248513376">"Tænd radioen, inden du får vist disse indstillinger."</string>
<string name="close_dialog" msgid="2365884406356986917">"OK"</string>
<string name="enable" msgid="7248657275000173526">"Aktivér"</string>
@@ -315,7 +315,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (anbefales)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (anbefales)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Kun TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Vælg system"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Skift CDMA-roamingtilstand"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Vælg system"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 2fd8dad..8b7c2d1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -313,7 +313,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (empfohlen)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (empfohlen)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Nur TD-SCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Systemauswahl"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA-Roamingmodus ändern"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemauswahl"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0aa0891..cda79f4 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (συνιστάται)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (συνιστάται)"</string>
<string name="network_global" msgid="1323190488685355309">"Παγκοσμίως"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Μόνο TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Επιλογή συστήματος"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Αλλαγή της λειτουργίας περιαγωγής CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Επιλογή συστήματος"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 2b6a9a1..03d313a 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recommended)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recommended)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA Only"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"System select"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Change the CDMA roaming mode"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"System select"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2b6a9a1..03d313a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recommended)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recommended)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA Only"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"System select"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Change the CDMA roaming mode"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"System select"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 2b6a9a1..03d313a 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recommended)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recommended)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA Only"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"System select"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Change the CDMA roaming mode"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"System select"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7dea39b..d504748 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recomendado)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recomendado)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Solo TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sistema seleccionado"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Cambiar el modo itinerancia CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistema seleccionado"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6e2f82d..61948d6 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -313,7 +313,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recomendado)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recomendado)"</string>
<string name="network_global" msgid="1323190488685355309">"Mundial"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Solo TD-SCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Selección de sistema"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Cambiar modo de itinerancia CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selección de sistema"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ef0a136..b4e75a5 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (soovitatav)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (soovitatav)"</string>
<string name="network_global" msgid="1323190488685355309">"Üldine"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Ainult TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Süsteemi valik"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Muuda CDMA-rändlusrežiimi"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Süsteemi valik"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index c4dd6bc..2ba20bd 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -315,7 +315,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (gomendatua)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (gomendatua)"</string>
<string name="network_global" msgid="1323190488685355309">"Orokorra"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA soilik"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sistemaren hautapena"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Aldatu CDMA ibiltaritza modua"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistemaren hautapena"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 085a569..10a14e3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (توصیه شده)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (توصیه شده)"</string>
<string name="network_global" msgid="1323190488685355309">"سراسری"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"فقط TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"انتخاب سیستم"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"تغییر حالت رومینگ CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"انتخاب سیستم"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b38a760..29cec4d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -313,7 +313,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (suositus)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (suositus)"</string>
<string name="network_global" msgid="1323190488685355309">"Maailmanlaajuinen"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Vain TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Valitse järjestelmä"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Vaihda CDMA-roaming-tila"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Valitse järjestelmä"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 4da5419..0f53fca 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -313,7 +313,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recommandé)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recommandé)"</string>
<string name="network_global" msgid="1323190488685355309">"International"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA uniquement"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sélection système"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Modifier le mode d\'itinérance CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sélection système"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1339bbc..9b3a787 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recommandé)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recommandé)"</string>
<string name="network_global" msgid="1323190488685355309">"International"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA uniquement"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sélection système"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Modifier le mode d\'itinérance CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sélection système"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index f70d99b..7dfa755 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recomendado)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recomendado)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Só TD-SCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Selección do sistema"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Cambiar o modo de itinerancia CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selección do sistema"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 7a4ab83..e78079d 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (ભલામણ કરેલ)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (ભલામણ કરેલ)"</string>
<string name="network_global" msgid="1323190488685355309">"વૈશ્વિક"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"માત્ર TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"સિસ્ટમ પસંદગી"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA રોમિંગ મોડ બદલો"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"સિસ્ટમ પસંદગી"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index cb3700a..fe78eb4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (सुझाये गये)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (सुझाये गये)"</string>
<string name="network_global" msgid="1323190488685355309">"वैश्विक"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"केवल TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"सिस्टम चयन"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA रोमिंग मोड बदलें"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"सिस्टम चयन"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index efdb36c..0cf772a 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (preporučeno)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (preporučeno)"</string>
<string name="network_global" msgid="1323190488685355309">"Globalno"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Samo TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Odabir sustava"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Promijeni način rada CDMA roaminga"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Odabir sustava"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 76e4270..7859970 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (javasolt)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (javasolt)"</string>
<string name="network_global" msgid="1323190488685355309">"Globális"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Csak TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Rendszer kiválasztása"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"A CDMA-barangolási mód megváltoztatása"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Rendszer kiválasztása"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index e3a0fb7..f75d05a 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -315,7 +315,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (խորհուրդ է տրվում)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (խորհուրդ է տրվում)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Միայն TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Համակարգի ընտրություն"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Փոխել CDMA ռոումինգի ռեժիմը"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Համակարգի ընտրությում"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ef15bcb..182a33f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (disarankan)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (disarankan)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Hanya TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Pilih sistem"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Ubah mode roaming CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pilih sistem"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 01bf112..c79fab4 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (ráðlagt)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (ráðlagt)"</string>
<string name="network_global" msgid="1323190488685355309">"Alþjóðlegt"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Aðeins TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Kerfisval"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Breyta CDMA-reikistillingu"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Kerfisval"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a38842b..a10fe4a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -313,7 +313,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (opzione consigliata)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (opzione consigliata)"</string>
<string name="network_global" msgid="1323190488685355309">"Globale"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Solo TD-SCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Selezione sistema"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Cambia la modalità roaming CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selezione sistema"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ee4b348..0cfc43e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (מומלץ)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (מומלץ)"</string>
<string name="network_global" msgid="1323190488685355309">"גלובלי"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA בלבד"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"בחירת מערכת"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"שנה את מצב נדידת CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"בחירת מערכת"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 039284f..56a5b9e 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE（推奨）"</string>
<string name="network_4G" msgid="2723512640529983138">"4G（推奨）"</string>
<string name="network_global" msgid="1323190488685355309">"グローバル"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMAのみ"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"システムの選択"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMAローミングモードを変更する"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"システムの選択"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index b46fc59..0c86da2 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (რეკომენდებული)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (რეკომენდებული)"</string>
<string name="network_global" msgid="1323190488685355309">"გლობალური"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"მხოლოდ TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"სისტემის არჩევა"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA როუმინგის რეჟიმის შეცვლა"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"სისტემის არჩევა"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index e52ff67..c94d96b 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (ұсынылған)"</string>
<string name="network_4G" msgid="2723512640529983138">"4Г (ұсынылған)"</string>
<string name="network_global" msgid="1323190488685355309">"Жаһандық"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Тек TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Жүйе таңдау"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA роуминг режимін өзгерту"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Жүйе таңдау"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 26e7150..0ded42f 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (បានផ្ដល់អនុសាសន៍)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (បានផ្ដល់អនុសាសន៍)"</string>
<string name="network_global" msgid="1323190488685355309">"សកល"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA តែប៉ុណ្ណោះ"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"ជ្រើសប្រព័ន្ធ"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"ប្ដូររបៀបរ៉ូមីង CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"ជ្រើសប្រព័ន្ធ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index db63e2a..0317062 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ)"</string>
<string name="network_global" msgid="1323190488685355309">"ಜಾಗತಿಕ"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA ಮಾತ್ರ"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"ಸಿಸ್ಟಂ ಆಯ್ಕೆ"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA ರೋಮಿಂಗ್ ಮೋಡ್ ಬದಲಾಯಿಸಿ"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"ಸಿಸ್ಟಂ ಆಯ್ಕೆ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index eadadf7..a4b6fb6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE(권장)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G(권장)"</string>
<string name="network_global" msgid="1323190488685355309">"전체"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA 전용"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"시스템 선택"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA 로밍 모드 변경"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"시스템 선택"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index cc6503a..9dd9d7c 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (сунушталат)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (сунушталат)"</string>
<string name="network_global" msgid="1323190488685355309">"Глобалдуу"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA гана"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Тутум тандоо"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA роуминг тартибин алмаштыруу"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Тутум тандоо"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 523df32..7130ff0 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (ແນະນໍາ)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (ແນະນໍາ)"</string>
<string name="network_global" msgid="1323190488685355309">"ທົ່ວໂລກ"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA ເທົ່ານັ້ນ"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"ການເລືອກລະບົບ"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"ປ່ຽນຮູບແບບການໂຣມມິງ CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"ການເລືອກລະບົບ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 9d3091b..4399b42 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (rekomenduojamas)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (rekomenduojamas)"</string>
<string name="network_global" msgid="1323190488685355309">"Visuotinis"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Tik veikiant TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sistemos pasirinkimas"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Pakeisti tarptinklinio CDMA ryšio režimą"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistemos pasirinkimas"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d21c10f..c7ade93 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -311,7 +311,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (ieteicams)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (ieteicams)"</string>
<string name="network_global" msgid="1323190488685355309">"Visā pasaulē"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Tikai TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sistēmas atlasīšana"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Mainīt CDMA viesabonēšanas režīmu"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistēmas atlasīšana"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 5e01b1d..5c53aac 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -315,7 +315,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (препорачано)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (препорачано)"</string>
<string name="network_global" msgid="1323190488685355309">"Глобална"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Само TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Избирање систем"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Промена на режим на роаминг на CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Избирање систем"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 5ccfdf4..3c42121 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (ശുപാർശചെയ്തത്)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (ശുപാർശചെയ്തത്)"</string>
<string name="network_global" msgid="1323190488685355309">"ഗ്ലോബൽ"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA മാത്രം"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"സിസ്റ്റം സെലക്ട്"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA റോമിംഗ് മോഡ് മാറ്റുക"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"സിസ്റ്റം സെലക്ട്"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 29f5717..a046c5c 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (зөвлөмж болгосон)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (зөвлөмж болгосон)"</string>
<string name="network_global" msgid="1323190488685355309">"Глобал"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Зөвхөн TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Систем сонгох"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA роуминг төлвийг өөрчлөх"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Систем сонгох"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 672c901..472d6ee 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (शिफारस केलेले)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (शिफारस केलेले)"</string>
<string name="network_global" msgid="1323190488685355309">"जागतिक"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"केवळ TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"सिस्टीम निवडा"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA रोमिंग मोड बदला"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"सिस्टीम निवडा"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index e55f88d..3e146b9 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (disyorkan)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (disyorkan)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA Sahaja"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Pilihan sistem"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Tukar mod perayauan CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pilihan sistem"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index da6640f..f6092aa 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (အကြံပြု)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (အကြုံပြု)"</string>
<string name="network_global" msgid="1323190488685355309">"တစ်ကမ္ဘာလုံးဆိုင်ရာ"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA သာ"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"စစ်စတန် ရွေးချယ်ရန်"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA ရုန်းမင်းကို ပြောင်းလဲခြင်း"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"စစ်စတန်ရွေးချယ်ခြင်း"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e7a175d..9e101f8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -315,7 +315,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (anbefales)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (anbefales)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Bare TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Systemvalg"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Velg roamingmodus for CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemvalg"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 90f5838..c275b7c 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (सिफारिस गरिएको)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (सिफारिस गरिएको)"</string>
<string name="network_global" msgid="1323190488685355309">"विश्वव्यापी"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA मात्र"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"प्रणाली चयन गर्नुहोस्"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA रोमिङ मोडलाई परिवर्तन गर्नुहोस्"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"प्रणाली चयन गर्नुहोस्"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1ddc28d..ded1651 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (aanbevolen)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (aanbevolen)"</string>
<string name="network_global" msgid="1323190488685355309">"Algemeen"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Alleen TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Systeem selecteren"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"De CDMA-roamingmodus wijzigen"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systeem selecteren"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 5f62dd1..874e4ed 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (ਸਿਫਾਰਿਸ਼ ਕੀਤਾ)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (ਸਿਫਾਰਿਸ਼ ਕੀਤਾ)"</string>
<string name="network_global" msgid="1323190488685355309">"ਗਲੋਬਲ"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"ਸਿਰਫ਼ TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"ਸਿਸਟਮ ਚੁਣੋ"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA ਰੋਮਿੰਗ ਮੋਡ ਬਦਲੋ"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"ਸਿਸਟਮ ਚੁਣੋ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 709111b..70f5148 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (zalecana)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (zalecana)"</string>
<string name="network_global" msgid="1323190488685355309">"Globalna"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Tylko TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Wybór systemu"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Zmień tryb roamingu CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Wybór systemu"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index ec68f9a..be37c07 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recomendado)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recomendado)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Apenas TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Seleccionar sistema"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Alterar o modo de roaming CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Seleccionar sistema"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d4c8667..fba21c8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recomendável)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recomendável)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Somente TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Seleção de sistema"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Alterar o modo de roaming CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selecionar sistema"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 992ec51..75bbeb9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (recomandat)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (recomandat)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Numai TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Selectaţi sistemul"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Schimbaţi modul de roaming CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selectaţi sistemul"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c541df9..3da2429 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -311,7 +311,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (рекомендуется)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (рекомендуется)"</string>
<string name="network_global" msgid="1323190488685355309">"Все"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Только TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Выбор системы"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Изменить режим роуминга CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Выбор системы"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index e16230b..43b0c62 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (නිර්දෙශිත)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (නිර්දෙශිත)"</string>
<string name="network_global" msgid="1323190488685355309">"ගෝලීය"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA පමණි"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"පද්ධතිය තේරුම"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA රෝමින් ආකාරය වෙනස් කරන්න"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"පද්ධතිය තේරුම"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b3060b5..3be08f7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (odporúčané)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (odporúčané)"</string>
<string name="network_global" msgid="1323190488685355309">"Globálne"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Iba TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Výber systému"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Zmeniť režim roamingu CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Výber systému"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ad05529..49aca6c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (priporočeno)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (priporočeno)"</string>
<string name="network_global" msgid="1323190488685355309">"Globalno"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Samo TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sistemska izbira"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Spremeni način gostovanja CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistemska izbira"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 1336718..5e51847 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (rekomandohet)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (rekomandohet)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Vetëm TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Përzgjedhje e sistemit"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Ndrysho modalitetin CDMA të roaming-ut"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Përzgjedhje e sistemit"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c201c91..319660e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (препоручено)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (препоручено)"</string>
<string name="network_global" msgid="1323190488685355309">"Глобално"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Само TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Избор система"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Промена режима CDMA роминга"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Избор система"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9adb1b4..b36e59a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -315,7 +315,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (rekommenderas)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (rekommenderas)"</string>
<string name="network_global" msgid="1323190488685355309">"Globalt"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Endast TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Systemval"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Ändra CDMA-roamingläge"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemval"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 4754281..927c589 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (inapendekezwa)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (inapendekezwa)"</string>
<string name="network_global" msgid="1323190488685355309">"Ulimwenguni Kote"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA Pekee"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Chagua mfumo"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Badilisha hali ya urandaji ya CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Chagua mfumo"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 0c75b63..cf93b97 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (பரிந்துரைக்கப்பட்டது)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (பரிந்துரைக்கப்பட்டது)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA மட்டும்"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"அமைப்பைத் தேர்ந்தெடுக்கவும்"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA ரோமிங் பயன்முறையை மாற்று"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"அமைப்பைத் தேர்ந்தெடுக்கவும்"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 37ca8cc..a2c577d 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (సిఫార్సు చేయబడింది)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (సిఫార్సు చేయబడింది)"</string>
<string name="network_global" msgid="1323190488685355309">"గ్లోబల్"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA మాత్రమే"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"సిస్టమ్ ఎంపిక"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA రోమింగ్ మోడ్ను మార్చండి"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"సిస్టమ్ ఎంపిక"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d0db8d6..4aaec69 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (แนะนำ)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (แนะนำ)"</string>
<string name="network_global" msgid="1323190488685355309">"ทั่วโลก"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA เท่านั้น"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"การเลือกระบบ"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"เปลี่ยนโหมดการเชื่อมต่อกับเครือข่าย CDMA อื่น"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"การเลือกระบบ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0cd56d6..72c9e86 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (inirerekomenda)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (inirerekomenda)"</string>
<string name="network_global" msgid="1323190488685355309">"Pandaigdigan"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"TDSCDMA Lang"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Pagpili ng system"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Baguhin ang mode ng pag-roam ng CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pagpili ng system"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f472083..501154b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (önerilir)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (önerilir)"</string>
<string name="network_global" msgid="1323190488685355309">"Küresel"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Yalnızca TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Sistem seç"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA dolaşım modunu değiştir"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistem seçin"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index fad4a7b..137d6a2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (рекомендується)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (рекомендується)"</string>
<string name="network_global" msgid="1323190488685355309">"Усі"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Лише TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Вибір системи"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Змінити режим CDMA-роумінгу"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Вибір системи"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 3339c95..d170948 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (تجویز کردہ)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (تجویز کردہ)"</string>
<string name="network_global" msgid="1323190488685355309">"عالمی"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"صرف TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"نظام کا انتخاب"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA رومنگ طرز تبدیل کریں"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"نظام کا انتخاب"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 747269a..6077ee3 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (tavsiya qilinadi)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (tavsiya qilinadi)"</string>
<string name="network_global" msgid="1323190488685355309">"Global"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Faqat TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Tizimni tanlash"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA tarmog‘i rouming rejimini o‘zgartirish"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Tizimni tanlash"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 139da4d..a0f708d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (được khuyến nghị)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (được khuyến nghị)"</string>
<string name="network_global" msgid="1323190488685355309">"Toàn cầu"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"Chỉ TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Chọn hệ thống"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Thay đổi chế độ chuyển vùng CDMA"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Chọn hệ thống"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8a6aea3..4affbbe 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -309,7 +309,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE（建议）"</string>
<string name="network_4G" msgid="2723512640529983138">"4G（建议）"</string>
<string name="network_global" msgid="1323190488685355309">"通用"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"仅限 TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"系统选择"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"更改 CDMA 漫游模式"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"系统选择"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index ec4a73f..387b2b9 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -315,7 +315,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (建議)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (建議)"</string>
<string name="network_global" msgid="1323190488685355309">"通用"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"只限 TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"選取系統"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"更改 CDMA 漫遊模式"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"選取系統"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ec63a7f..c2ae929 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -315,7 +315,6 @@
<string name="network_lte" msgid="7702681952521375754">"LTE (建議)"</string>
<string name="network_4G" msgid="2723512640529983138">"4G (建議)"</string>
<string name="network_global" msgid="1323190488685355309">"通用"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"僅限 TDSCDMA"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"選取系統"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"變更 CDMA 漫遊模式"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"選取系統"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8d2bba1..aa378ef 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -313,7 +313,6 @@
<string name="network_lte" msgid="7702681952521375754">"I-LTE (inconyiwe)"</string>
<string name="network_4G" msgid="2723512640529983138">"I-4G (inconyiwe)"</string>
<string name="network_global" msgid="1323190488685355309">"Emhlabeni jikelele"</string>
- <string name="network_tdscdma" msgid="4713495909689860245">"I-TDSCDMA kuphela"</string>
<string name="cdma_system_select_title" msgid="5757657769327732833">"Khetha uhlelo"</string>
<string name="cdma_system_select_summary" msgid="60460043745797517">"Sintsha imodi yokuzulazula ye-cdma"</string>
<string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Khetha uhlelo"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba13365..0d5f42e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -596,7 +596,6 @@
<string name="network_2G" translatable="false">2G</string>
<string name="network_1x" translatable="false">1x</string>
<string name="network_global">Global</string>
- <string name="network_tdscdma">TDSCDMA Only</string>
<string-array name="enabled_networks_except_gsm_choices" translatable="false">
<item>@string/network_lte</item>
@@ -678,13 +677,11 @@
<item>@string/network_lte</item>
<item>@string/network_3G</item>
<item>@string/network_2G</item>
- <item>@string/network_tdscdma</item>
</string-array>
<string-array name="enabled_networks_tdscdma_values" translatable="false">
<item>"22"</item>
<item>"18"</item>
<item>"1"</item>
- <item>"13"</item>
</string-array>
<!-- CDMA System select strings -->
diff --git a/src/com/android/phone/BluetoothManager.java b/src/com/android/phone/BluetoothManager.java
deleted file mode 100644
index 3f0ce6f..0000000
--- a/src/com/android/phone/BluetoothManager.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.phone;
-
-public class BluetoothManager {
- public BluetoothManager() {
- }
-
- /* package */ boolean isBluetoothHeadsetAudioOn() {
- return false;
- }
-
- /* package */ boolean isBluetoothAvailable() {
- return false;
- }
-
- /* package */ boolean isBluetoothAudioConnected() {
- return false;
- }
-
- /* package */ boolean isBluetoothAudioConnectedOrPending() {
- return false;
- }
-
- /* package */ boolean showBluetoothIndication() {
- return false;
- }
-
- /* package */ void updateBluetoothIndication() {
- }
-
- public void addBluetoothIndicatorListener(BluetoothIndicatorListener listener) {
- }
-
- public void removeBluetoothIndicatorListener(BluetoothIndicatorListener listener) {
- }
-
- /* package */ void connectBluetoothAudio() {
- }
-
- /* package */ void disconnectBluetoothAudio() {
- }
-
- /* package */ interface BluetoothIndicatorListener {
- public void onBluetoothIndicationChange(boolean isConnected, BluetoothManager manager);
- }
-}
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 895c685..2f835fe 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -83,8 +83,6 @@
implements Preference.OnPreferenceChangeListener {
private static final String LOG_TAG = "CallFeaturesSetting";
private static final boolean DBG = (PhoneGlobals.DBG_LEVEL >= 2);
- // STOPSHIP if true. Flag to override behavior default behavior to hide VT setting.
- private static final boolean ENABLE_VT_FLAG = true;
// String keys for preference lookup
// TODO: Naming these "BUTTON_*" is confusing since they're not actually buttons(!)
@@ -264,7 +262,7 @@
}
}
- if (ImsManager.isVtEnabledByPlatform(mPhone.getContext()) && ENABLE_VT_FLAG) {
+ if (ImsManager.isVtEnabledByPlatform(mPhone.getContext())) {
boolean currentValue =
ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mPhone.getContext())
? PhoneGlobals.getInstance().phoneMgr.isVideoCallingEnabled(
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index dd1eaab..14913f9 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -105,7 +105,6 @@
// Cached AudioManager
private AudioManager mAudioManager;
- private final BluetoothManager mBluetoothManager;
private SubscriptionManager mSubscriptionManager;
private TelephonyManager mTelephonyManager;
@@ -116,11 +115,10 @@
/* package */ static CallNotifier init(
PhoneGlobals app,
CallLogger callLogger,
- CallStateMonitor callStateMonitor,
- BluetoothManager bluetoothManager) {
+ CallStateMonitor callStateMonitor) {
synchronized (CallNotifier.class) {
if (sInstance == null) {
- sInstance = new CallNotifier(app, callLogger, callStateMonitor, bluetoothManager);
+ sInstance = new CallNotifier(app, callLogger, callStateMonitor);
} else {
Log.wtf(LOG_TAG, "init() called multiple times! sInstance = " + sInstance);
}
@@ -132,12 +130,10 @@
private CallNotifier(
PhoneGlobals app,
CallLogger callLogger,
- CallStateMonitor callStateMonitor,
- BluetoothManager bluetoothManager) {
+ CallStateMonitor callStateMonitor) {
mApplication = app;
mCM = app.mCM;
mCallLogger = callLogger;
- mBluetoothManager = bluetoothManager;
mAudioManager = (AudioManager) mApplication.getSystemService(Context.AUDIO_SERVICE);
mTelephonyManager =
@@ -449,13 +445,6 @@
mPreviousCdmaCallState = fgPhone.getForegroundCall().getState();
}
- // Have the PhoneApp recompute its mShowBluetoothIndication
- // flag based on the (new) telephony state.
- // There's no need to force a UI update since we update the
- // in-call notification ourselves (below), and the InCallScreen
- // listens for phone state changes itself.
- mBluetoothManager.updateBluetoothIndication();
-
// Update the phone state and other sensor/lock.
mApplication.updatePhoneState(state);
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index b470398..2522611 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1163,7 +1163,7 @@
case Phone.NT_MODE_TDSCDMA_ONLY:
mButtonEnabledNetworks.setValue(
Integer.toString(Phone.NT_MODE_TDSCDMA_ONLY));
- mButtonEnabledNetworks.setSummary(R.string.network_tdscdma);
+ mButtonEnabledNetworks.setSummary(R.string.network_3G);
break;
case Phone.NT_MODE_LTE_TDSCDMA_GSM:
case Phone.NT_MODE_LTE_TDSCDMA_GSM_WCDMA:
diff --git a/src/com/android/phone/OtaUtils.java b/src/com/android/phone/OtaUtils.java
index fd2e206..a37ce80 100644
--- a/src/com/android/phone/OtaUtils.java
+++ b/src/com/android/phone/OtaUtils.java
@@ -162,9 +162,6 @@
// an InCallScreen or CallCard or any OTASP UI elements at all.
private boolean mInteractive = true;
- // used when setting speakerphone
- private final BluetoothManager mBluetoothManager;
-
/**
* OtaWidgetData class represent all OTA UI elements
*
@@ -209,12 +206,11 @@
* Note if interactive is true, you must also call updateUiWidgets() as soon
* as the InCallScreen instance is ready.
*/
- public OtaUtils(Context context, boolean interactive, BluetoothManager bluetoothManager) {
+ public OtaUtils(Context context, boolean interactive) {
if (DBG) log("OtaUtils constructor...");
mApplication = PhoneGlobals.getInstance();
mContext = context;
mInteractive = interactive;
- mBluetoothManager = bluetoothManager;
}
/**
@@ -385,8 +381,7 @@
}
// Create the OtaUtils instance.
- app.otaUtils = new OtaUtils(context, false /* non-interactive mode */,
- app.getBluetoothManager());
+ app.otaUtils = new OtaUtils(context, false /* non-interactive mode */);
if (DBG) log("- created OtaUtils: " + app.otaUtils);
// ... and kick off the OTASP call.
@@ -501,8 +496,7 @@
}
// Create the OtaUtils instance.
- app.otaUtils = new OtaUtils(app.getApplicationContext(), true /* interactive */,
- app.getBluetoothManager());
+ app.otaUtils = new OtaUtils(app.getApplicationContext(), true /* interactive */);
if (DBG) log("- created OtaUtils: " + app.otaUtils);
// NOTE we still need to call OtaUtils.updateUiWidgets() once the
@@ -560,10 +554,6 @@
return;
}
- if (state && mBluetoothManager.isBluetoothAvailable()
- && mBluetoothManager.isBluetoothAudioConnected()) {
- mBluetoothManager.disconnectBluetoothAudio();
- }
PhoneUtils.turnOnSpeaker(mContext, state, true);
}
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index fc08c5f..c6081b1 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -109,8 +109,7 @@
private static final int EVENT_DATA_ROAMING_DISCONNECTED = 10;
private static final int EVENT_DATA_ROAMING_OK = 11;
private static final int EVENT_UNSOL_CDMA_INFO_RECORD = 12;
- private static final int EVENT_DOCK_STATE_CHANGED = 13;
- private static final int EVENT_START_SIP_SERVICE = 14;
+ private static final int EVENT_START_SIP_SERVICE = 13;
// The MMI codes are also used by the InCallScreen.
public static final int MMI_INITIATE = 51;
@@ -152,11 +151,9 @@
public SimActivationManager simActivationManager;
CarrierConfigLoader configLoader;
- private BluetoothManager bluetoothManager;
private CallGatewayManager callGatewayManager;
private CallStateMonitor callStateMonitor;
- static int mDockState = Intent.EXTRA_DOCK_STATE_UNDOCKED;
static boolean sVoiceCapable = true;
// TODO: Remove, no longer used.
@@ -292,23 +289,6 @@
case EVENT_UNSOL_CDMA_INFO_RECORD:
//TODO: handle message here;
break;
-
- case EVENT_DOCK_STATE_CHANGED:
- // If the phone is docked/undocked during a call, and no wired or BT headset
- // is connected: turn on/off the speaker accordingly.
- boolean inDockMode = false;
- if (mDockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
- inDockMode = true;
- }
- if (VDBG) Log.d(LOG_TAG, "received EVENT_DOCK_STATE_CHANGED. Phone inDock = "
- + inDockMode);
-
- phoneState = mCM.getState();
- if (phoneState == PhoneConstants.State.OFFHOOK &&
- !bluetoothManager.isBluetoothHeadsetAudioOn()) {
- PhoneUtils.turnOnSpeaker(getApplicationContext(), inDockMode, true);
- }
- break;
}
}
};
@@ -394,9 +374,6 @@
// Monitors call activity from the telephony layer
callStateMonitor = new CallStateMonitor(mCM);
- // Bluetooth manager
- bluetoothManager = new BluetoothManager();
-
phoneMgr = PhoneInterfaceManager.init(this, PhoneFactory.getDefaultPhone());
configLoader = CarrierConfigLoader.init(this);
@@ -405,7 +382,7 @@
// asynchronous events from the telephony layer (like
// launching the incoming-call UI when an incoming call comes
// in.)
- notifier = CallNotifier.init(this, callLogger, callStateMonitor, bluetoothManager);
+ notifier = CallNotifier.init(this, callLogger, callStateMonitor);
PhoneUtils.registerIccStatus(mHandler, EVENT_SIM_NETWORK_LOCKED);
@@ -419,7 +396,6 @@
IntentFilter intentFilter =
new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
intentFilter.addAction(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
- intentFilter.addAction(Intent.ACTION_DOCK_EVENT);
intentFilter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
intentFilter.addAction(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
@@ -497,10 +473,6 @@
return PhoneFactory.getPhone(SubscriptionManager.getPhoneId(subId));
}
- /* package */ BluetoothManager getBluetoothManager() {
- return bluetoothManager;
- }
-
/* package */ CallManager getCallManager() {
return mCM;
}
@@ -863,11 +835,6 @@
+ "but ECM isn't supported for phone: "
+ mCM.getFgPhone().getPhoneName());
}
- } else if (action.equals(Intent.ACTION_DOCK_EVENT)) {
- mDockState = intent.getIntExtra(Intent.EXTRA_DOCK_STATE,
- Intent.EXTRA_DOCK_STATE_UNDOCKED);
- if (VDBG) Log.d(LOG_TAG, "ACTION_DOCK_EVENT -> mDockState = " + mDockState);
- mHandler.sendMessage(mHandler.obtainMessage(EVENT_DOCK_STATE_CHANGED, 0));
}
}
}
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 6f828db..b996f69 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -151,7 +151,6 @@
private static final String PREF_CARRIERS_ALPHATAG_PREFIX = "carrier_alphtag_";
private static final String PREF_CARRIERS_NUMBER_PREFIX = "carrier_number_";
private static final String PREF_CARRIERS_SUBSCRIBER_PREFIX = "carrier_subscriber_";
- private static final String PREF_ENABLE_VIDEO_CALLING = "enable_video_calling";
/**
* A request object to use for transmitting data to an ICC.
@@ -2629,9 +2628,7 @@
@Override
public void enableVideoCalling(boolean enable) {
enforceModifyPermission();
- SharedPreferences.Editor editor = mTelephonySharedPreferences.edit();
- editor.putBoolean(PREF_ENABLE_VIDEO_CALLING, enable);
- editor.commit();
+ ImsManager.setVtSetting(mPhone.getContext(), enable);
}
@Override
@@ -2646,7 +2643,7 @@
// which can support video calling.
return ImsManager.isVtEnabledByPlatform(mPhone.getContext())
&& ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mPhone.getContext())
- && mTelephonySharedPreferences.getBoolean(PREF_ENABLE_VIDEO_CALLING, true);
+ && ImsManager.isVtEnabledByUser(mPhone.getContext());
}
@Override
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 1fa886c..474b9d0 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -145,6 +145,10 @@
private static AlertDialog sUssdDialog = null;
private static StringBuilder sUssdMsg = new StringBuilder();
+ private static final ComponentName PSTN_CONNECTION_SERVICE_COMPONENT =
+ new ComponentName("com.android.phone",
+ "com.android.services.telephony.TelephonyConnectionService");
+
/**
* Handler that tracks the connections and updates the value of the
* Mute settings for each connection as needed.
@@ -252,26 +256,6 @@
answered = true;
setAudioMode();
-
- // Check is phone in any dock, and turn on speaker accordingly
- final boolean speakerActivated = activateSpeakerIfDocked(phone);
-
- final BluetoothManager btManager = app.getBluetoothManager();
-
- // When answering a phone call, the user will move the phone near to her/his ear
- // and start conversation, without checking its speaker status. If some other
- // application turned on the speaker mode before the call and didn't turn it off,
- // Phone app would need to be responsible for the speaker phone.
- // Here, we turn off the speaker if
- // - the phone call is the first in-coming call,
- // - we did not activate speaker by ourselves during the process above, and
- // - Bluetooth headset is not in use.
- if (isRealIncomingCall && !speakerActivated && isSpeakerOn(app)
- && !btManager.isBluetoothHeadsetAudioOn()) {
- // This is not an error but might cause users' confusion. Add log just in case.
- Log.i(LOG_TAG, "Forcing speaker off due to new incoming call...");
- turnOnSpeaker(app, false, true);
- }
} catch (CallStateException ex) {
Log.w(LOG_TAG, "answerCall: caught " + ex, ex);
@@ -669,20 +653,6 @@
startGetCallerInfo(context, connection, null, null, gatewayInfo);
setAudioMode();
-
- if (DBG) log("about to activate speaker");
- // Check is phone in any dock, and turn on speaker accordingly
- final boolean speakerActivated = activateSpeakerIfDocked(phone);
-
- final BluetoothManager btManager = app.getBluetoothManager();
-
- // See also similar logic in answerCall().
- if (initiallyIdle && !speakerActivated && isSpeakerOn(app)
- && !btManager.isBluetoothHeadsetAudioOn()) {
- // This is not an error but might cause users' confusion. Add log just in case.
- Log.i(LOG_TAG, "Forcing speaker off when initiating a new outgoing call...");
- PhoneUtils.turnOnSpeaker(app, false, true);
- }
}
return status;
@@ -2196,35 +2166,6 @@
return PhoneNumberUtils.isGlobalPhoneNumber(number);
}
- /**
- * This function is called when phone answers or places a call.
- * Check if the phone is in a car dock or desk dock.
- * If yes, turn on the speaker, when no wired or BT headsets are connected.
- * Otherwise do nothing.
- * @return true if activated
- */
- private static boolean activateSpeakerIfDocked(Phone phone) {
- if (DBG) log("activateSpeakerIfDocked()...");
-
- boolean activated = false;
- if (PhoneGlobals.mDockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
- if (DBG) log("activateSpeakerIfDocked(): In a dock -> may need to turn on speaker.");
- final PhoneGlobals app = PhoneGlobals.getInstance();
-
- // TODO: This function should move to AudioRouter
- final BluetoothManager btManager = app.getBluetoothManager();
- //final WiredHeadsetManager wiredHeadset = app.getWiredHeadsetManager();
- //final AudioRouter audioRouter = app.getAudioRouter();
-
- /*if (!wiredHeadset.isHeadsetPlugged() && !btManager.isBluetoothHeadsetAudioOn()) {
- //audioRouter.setSpeaker(true);
- activated = true;
- }*/
- }
- return activated;
- }
-
-
/**
* Returns whether the phone is in ECM ("Emergency Callback Mode") or not.
*/
@@ -2511,7 +2452,7 @@
}
private static ComponentName getPstnConnectionServiceName() {
- return new ComponentName(PhoneGlobals.getInstance(), TelephonyConnectionService.class);
+ return PSTN_CONNECTION_SERVICE_COMPONENT;
}
private static Phone getPhoneFromIccId(String iccId) {
diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index c08b32a..27de57c 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -7,6 +7,7 @@
import android.graphics.drawable.Icon;
import android.net.sip.SipManager;
import android.os.Bundle;
+import android.os.UserManager;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
@@ -150,7 +151,7 @@
getPreferenceScreen().removePreference(mAccountList);
}
- if (SipUtil.isVoipSupported(getActivity())) {
+ if (isPrimaryUser() && SipUtil.isVoipSupported(getActivity())) {
mSipSharedPreferences = new SipSharedPreferences(getActivity());
mUseSipCalling = (ListPreference)
@@ -450,4 +451,13 @@
return intent;
}
+
+ /**
+ * @return Whether the current user is the primary user.
+ */
+ private boolean isPrimaryUser() {
+ final UserManager userManager = (UserManager) getActivity()
+ .getSystemService(Context.USER_SERVICE);
+ return userManager.isPrimaryUser();
+ }
}
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 9106983..2e9ff59 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -691,7 +691,11 @@
setWifi(mOriginalConnection.isWifi());
setVideoProvider(mOriginalConnection.getVideoProvider());
setAudioQuality(mOriginalConnection.getAudioQuality());
- updateExtras(mOriginalConnection.getConnectionExtras());
+
+ // Post update of extras to the handler; extras are updated via the handler to ensure thread
+ // safety.
+ mHandler.obtainMessage(MSG_CONNECTION_EXTRAS_CHANGED,
+ mOriginalConnection.getConnectionExtras()).sendToTarget();
if (PhoneNumberUtils.isEmergencyNumber(mOriginalConnection.getAddress())) {
mTreatAsEmergencyCall = true;