am 19d14234: am 9cef8479: am f7d961dd: Merge "Phone: Ignore touch during network operators search" # By Shruthi N.K # Via Android Git Automerger (2) and others * commit '19d142349f0b418724afd33a89c0265328741c89': Phone: Ignore touch during network operators search

commit: 076ace4f1a1c26eb297c0ffa8461a8d5aec766d6 [log] [tgz]
author: Wink Saville <wink@google.com> Wed Jan 23 17:42:47 2013 -0800
committer: Android Git Automerger <android-git-automerger@android.com> Wed Jan 23 17:42:47 2013 -0800
tree: e27136c94b68fda8b09955cdaab29165abbff56c
parent: 7db28f9bd77c74ae8f2ddbaf9fe7c768144350af [diff]
parent: 19d142349f0b418724afd33a89c0265328741c89 [diff]
diff --git a/Android.mk b/Android.mk
index e36adad..5ec0e54 100644
--- a/Android.mk
+++ b/Android.mk

@@ -1,22 +1,11 @@
 LOCAL_PATH:= $(call my-dir)
 
-# Static library with some common classes for the phone apps.
-# To use it add this line in your Android.mk
-#  LOCAL_STATIC_JAVA_LIBRARIES := com.android.phone.common
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-	src/com/android/phone/CallLogAsync.java \
-	src/com/android/phone/HapticFeedback.java
-
-LOCAL_MODULE := com.android.phone.common
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
 # Build the Phone app which includes the emergency dialer. See Contacts
 # for the 'other' dialer.
 include $(CLEAR_VARS)
 
 LOCAL_JAVA_LIBRARIES := telephony-common
+LOCAL_STATIC_JAVA_LIBRARIES := com.android.phone.shared
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_SRC_FILES += \
         src/com/android/phone/EventLogTags.logtags \

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b2d9733..36eed9c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml

@@ -407,15 +407,6 @@
             </intent-filter>
         </activity>
 
-        <!-- Data usage and throttling setting for ThrottleService in framework. -->
-        <activity android:name="DataUsage"
-                android:label="@string/throttle_data_usage"
-                android:theme="@android:style/Theme.Holo.DialogWhenLarge">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
-
         <!-- data roaming setting -->
         <activity android:name="RoamingSetting"
                 android:label="@string/roaming"

diff --git a/res/drawable-nodpi/background_dial_holo_dark.png b/res/drawable-nodpi/background_dial_holo_dark.png
deleted file mode 100644
index 3dba50c..0000000
--- a/res/drawable-nodpi/background_dial_holo_dark.png
+++ /dev/null
Binary files differ

diff --git a/res/drawable/background_dial_holo_dark.xml b/res/drawable/background_dial_holo_dark.xml
new file mode 100644
index 0000000..e06507f
--- /dev/null
+++ b/res/drawable/background_dial_holo_dark.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+            android:startColor="#ff020709"
+            android:endColor="#ff0a242d"
+            android:angle="270" />
+</shape>

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5f5e09d..1adae57 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Voorkeurnetwerk-modus: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Voorkeurnetwerk-modus: net CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Voorkeurnetwerk-modus: net EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Voorkeurnetwerk-modus: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Voorkeurnetwerk-modus: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Voorkeurnetwerk-modus: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Voorkeurnetwerk-modus: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Voorkeurnetwerk-modus: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Voorkeurnetwerk-modus: Globaal"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Voorkeurnetwerk-modus: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Net EvDo"</item>
-    <item msgid="454610224530856274">"CDMA sonder EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo outomaties"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA outomaties"</item>
-    <item msgid="5189164180446264504">"Net WCDMA"</item>
-    <item msgid="5714714953966979187">"Net GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA verkies"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globaal"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Net EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA sonder EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo outomaties"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA outomaties"</item>
+    <item msgid="7913148405605373434">"Net WCDMA"</item>
+    <item msgid="1524224863879435516">"Net GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA verkies"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data geaktiveer"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Aktiveer datatoegang via mobiele netwerk"</string>
@@ -589,7 +595,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ek bel jou nou-nou terug."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ek bel jou later."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kan nie nou praat nie. Bel my later?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Gepasmaakte boodskap"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skryf jou eie..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Vinnige antwoorde"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redigeer vinnige antwoorde"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 67420d6..4aa7f40 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"ተመራጭ የአውታረመረብ ፡CDMA/EvDo ሁነታ"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"ተመራጭ የአውታረመረብ ፡CDMA  ሁነታ ብቻ"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"ተመራጭ የአውታረመረብ ፡EvDo ሁነታ  ብቻ"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ተመራጭ የአውታረመረብ ፡LTE / CDMA ሁነታ"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"ተመራጭ የአውታረመረብ ሁኔታ: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"ተመራጭ የአውታረመረብ ሁኔታ፡ LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"ተመራጭ የአውታረመረብ ሁኔታ: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"ተመራጭ የአውታረመረብ ሁኔታ ፡ CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"ተመራጭ የአውታረመረብ ፡ አለምአቀፍ"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"ተመራጭ የአውታረመረብ ሁኔታ፡ LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE / CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo ብቻ"</item>
-    <item msgid="454610224530856274">"CDMA  ያለ EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo በራስ"</item>
-    <item msgid="7148247646407324800">"GSM / WCDMA ራስ"</item>
-    <item msgid="5189164180446264504">"WCDMA ብቻ"</item>
-    <item msgid="5714714953966979187">"GSM ብቻ"</item>
-    <item msgid="8508331239546115206">"GSM / WCDMA ተመራጭ"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE / CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"አለምአቀፍ"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo ብቻ"</item>
+    <item msgid="1508557726283094448">"CDMA  ያለ EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo በራስሰር"</item>
+    <item msgid="5958053792390386668">"GSM / WCDMA ራስሰር"</item>
+    <item msgid="7913148405605373434">"WCDMA ብቻ"</item>
+    <item msgid="1524224863879435516">"GSM ብቻ"</item>
+    <item msgid="3817924849415716259">"GSM / WCDMA ተመራጭ"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"ውሂብ ነቅቷል"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ የውሂብ መድረስ አንቃ"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"ወዲያው መልሼ እደውላለሁ።"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"ኋላ እደውላለሁ።"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"አሁን ማውራት አልችልም። ትንሽ ቆይተው ይደውሉ?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"ብጁ መልዕክት"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"የእራስዎን ይጻፉ..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"ፈጣን ምላሾች"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ፈጣን ምላሾች አርትዕ"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a60869c..0152af4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"وضع الشبكة المفضل: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"وضع الشبكة المفضل: CDMA فقط"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"وضع الشبكة المفضل: EvDo فقط"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"وضع الشبكة المفضل: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"وضع الشبكة المفضل: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"وضع الشبكة المفضل: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"وضع الشبكة المفضل: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"وضع الشبكة المفضل: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"وضع الشبكة المفضل: عام"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"وضع الشبكة المفضل: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo فقط"</item>
-    <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo تلقائي"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA تلقائي"</item>
-    <item msgid="5189164180446264504">"WCDMA فقط"</item>
-    <item msgid="5714714953966979187">"نظام GSM فقط"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA المفضلة"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"عام"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo فقط"</item>
+    <item msgid="1508557726283094448">"CDMA w/o EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo تلقائي"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA تلقائي"</item>
+    <item msgid="7913148405605373434">"WCDMA فقط"</item>
+    <item msgid="1524224863879435516">"نظام GSM فقط"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA المفضل"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"تم تمكين البيانات"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"تمكين الدخول إلى البيانات عبر شبكة الجوال"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"سأعاود الاتصال بك."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"سأتصل بك لاحقًا."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"لا يمكنني التحدث الآن. اتصل بي لاحقًا."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"رسالة مخصصة"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"اكتب ردك..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"الردود السريعة"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"تعديل الردود السريعة"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 26a8fb1..d0c38ee 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Пераважны рэжым сеткі: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Пераважны рэжым сеткі: толькі CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Пераважны рэжым сеткі: толькі EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Пераважны рэжым сеткі: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Пераважная сетка: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Пераважная сетка: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Пераважная сетка: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Пераважная сетка: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Пераважная сетка: глабальная"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Пераважная сетка: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Толькі EVDO"</item>
-    <item msgid="454610224530856274">"CDMA без EvDo"</item>
-    <item msgid="648505122852496166">"Аўтаматычны выбар CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Аўтаматычны выбар GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Толькі WCDMA"</item>
-    <item msgid="5714714953966979187">"Толькі GSM"</item>
-    <item msgid="8508331239546115206">"Пажадана GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Глабальныя"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Толькі EVDO"</item>
+    <item msgid="1508557726283094448">"CDMA без EvDo"</item>
+    <item msgid="4341433122263841224">"Аўтаматычны выбар CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Аўтаматычны выбар GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Толькі WCDMA"</item>
+    <item msgid="1524224863879435516">"Толькі GSM"</item>
+    <item msgid="3817924849415716259">"Пажадана GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Дадзеныя ўключаныя"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Уключыць перадачу дадзеных праз мабільныя сеткі"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Я ператэлефаную."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Я патэлефаную пазней."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Не магу размаўляць. Набяры пазней."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Карыстальніцкае паведамленне"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напiшыце сваё..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Хуткія адказы"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Рэдагаваць хуткія адказы"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ccb0823..38a5477 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Предпочитан режим на мрежата: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Предпочитан режим на мрежата: Само CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Предпочитан режим на мрежата: Само EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Предпочитан режим на мрежата: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Предпочитан режим на мрежата: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Предпочитан режим на мрежата: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Предпочитан режим на мрежата: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Предпочитан режим на мрежата: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Предпочитан режим на мрежата: Глобален"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Предпочитан режим на мрежата: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Само EvDo"</item>
-    <item msgid="454610224530856274">"CDMA без EvDo"</item>
-    <item msgid="648505122852496166">"Авт. CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Авт. GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Само WCDMA"</item>
-    <item msgid="5714714953966979187">"Само GSM"</item>
-    <item msgid="8508331239546115206">"Предпочита се GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Глобален"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Само EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA без EvDo"</item>
+    <item msgid="4341433122263841224">"Авт. CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Авт. GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Само WCDMA"</item>
+    <item msgid="1524224863879435516">"Само GSM"</item>
+    <item msgid="3817924849415716259">"Предпочита се GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Данните са активирани"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Активиране на достъп до данните в мобилната мрежа"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ще ви се обадя веднага обратно."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ще ви се обадя по-късно."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Сега не мога да говоря. По-късно?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Персонализирано съобщение"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напишете свой собствен..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Бързи отговори"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Редактиране на бързи отговори"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3efad33..b0bb6d6 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Mode de xarxa preferit: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Mode de xarxa preferit: només CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mode de xarxa preferit: només EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mode de xarxa preferit: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Mode de xarxa preferit: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Mode de xarxa preferit: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Mode de xarxa preferit: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mode de xarxa preferit: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mode de xarxa preferit: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mode de xarxa preferit: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Només EvDo"</item>
-    <item msgid="454610224530856274">"CDMA sense EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automàtic"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automàtic"</item>
-    <item msgid="5189164180446264504">"Només WCDMA"</item>
-    <item msgid="5714714953966979187">"Només GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA preferit"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Només EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA sense EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automàtic"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automàtic"</item>
+    <item msgid="7913148405605373434">"Només WCDMA"</item>
+    <item msgid="1524224863879435516">"Només GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferit"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dades activades"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Permet l\'accés a dades a través de la xarxa mòbil"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Et truco de seguida."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Et truco més tard."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Ara no puc parlar. Truques després?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Personalitza el missatge"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escriu la teva…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostes ràpides"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edita les respostes ràpides"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5a611a5..c1c13f7 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Upřednostňovaný režim sítě: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Upřednostňovaný režim sítě: pouze CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Upřednostňovaný režim sítě: pouze EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Upřednostňovaný režim sítě: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Preferovaný režim sítě: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Preferovaný režim sítě: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Preferovaný režim sítě: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferovaný režim sítě: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferovaný režim sítě: Globální"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferovaný režim sítě: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Pouze EvDo"</item>
-    <item msgid="454610224530856274">"CDMA bez EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo – automaticky"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA – automaticky"</item>
-    <item msgid="5189164180446264504">"Pouze WCDMA"</item>
-    <item msgid="5714714953966979187">"Pouze GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA – upřednostňováno"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globální"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Pouze EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA bez EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo – automaticky"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA – automaticky"</item>
+    <item msgid="7913148405605373434">"Pouze WCDMA"</item>
+    <item msgid="1524224863879435516">"Pouze GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA – preferováno"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dat. přenosy aktivovány"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Aktivovat datový přístup prostřednictvím mobilní sítě"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Zavolám zpátky."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Zavolám později."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nemůžu telefonovat, volejte jindy."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Vlastní zpráva"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napsat vlastní odpověď..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Rychlé odpovědi"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Upravit rychlé odpovědi"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index e5ad41d..62a42e6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Foretrukket netværkstilstand: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Foretrukken netværkstilstand: kun CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Foretrukken netværkstilstand: kun EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Foretrukken netværkstilstand: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Foretrukken netværkstilstand: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Foretrukken netværkstilstand: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Foretrukken netværkstilstand: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Foretrukken netværkstilstand: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Foretrukken netværkstilstand: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Foretrukken netværkstilstand: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Kun EvDo"</item>
-    <item msgid="454610224530856274">"CDMA u. EvDo"</item>
-    <item msgid="648505122852496166">"Automatisk CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Automatisk GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Kun WCDMA"</item>
-    <item msgid="5714714953966979187">"Kun GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA foretrækkes"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA+LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Kun EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA uden EvDo"</item>
+    <item msgid="4341433122263841224">"Automatisk CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Automatisk GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Kun WCDMA"</item>
+    <item msgid="1524224863879435516">"Kun GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA foretrækkes"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data aktiveret"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Aktivér dataadgang via mobilnetværk"</string>
@@ -591,7 +597,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Jeg ringer tilbage lige om lidt."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Jeg ringer til dig senere."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kan ikke tale nu. Ringer du senere?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Tilpasset besked"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv dit eget..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hurtige svar"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Rediger hurtige svar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7f14f70..a1574a4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Bevorzugter Netzwerkmodus: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Bevorzugter Netzwerkmodus: nur CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Bevorzugter Netzwerkmodus: nur EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Bevorzugter Netzwerkmodus: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Bevorzugter Netzwerkmodus: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Bevorzugter Netzwerkmodus: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Bevorzugter Netzwerkmodus: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Bevorzugter Netzwerkmodus: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Bevorzugter Netzwerkmodus: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Bevorzugter Netzwerkmodus: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Nur EvDo"</item>
-    <item msgid="454610224530856274">"CDMA ohne EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo (automatisch)"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA (automatisch)"</item>
-    <item msgid="5189164180446264504">"Nur WCDMA"</item>
-    <item msgid="5714714953966979187">"Nur GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA bevorzugt"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Nur EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA ohne EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo (automatisch)"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA (automatisch)"</item>
+    <item msgid="7913148405605373434">"Nur WCDMA"</item>
+    <item msgid="1524224863879435516">"Nur GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA bevorzugt"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Daten aktiviert"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Datenzugriff über Mobilfunknetz"</string>
@@ -589,7 +595,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ich rufe gleich zurück."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ich rufe später zurück."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kann jetzt nicht sprechen. Später?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Benutzerdefinierte SMS"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Eigene Antwort schreiben..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Kurzantworten"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Kurzantworten bearbeiten"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 14cf537..ed0939f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Προτιμώμενη λειτουργία δικτύου: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Προτιμώμενη λειτουργία δικτύου: μόνο CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Προτιμώμενη λειτουργία δικτύου: μόνο EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Προτιμώμενη λειτουργία δικτύου: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Προτιμώμενη λειτουργία δικτύου: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Προτιμώμενη λειτουργία δικτύου: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Προτιμώμενη λειτουργία δικτύου: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Προτιμώμενη λειτουργία δικτύου: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Προτιμώμενη λειτουργία δικτύου: Παγκόσμια"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Προτιμώμενη λειτουργία δικτύου: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE / CDMA"</item>
-    <item msgid="3273348576277144124">"Μόνο EvDo"</item>
-    <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"Αυτόματο EvDo/CDMA"</item>
-    <item msgid="7148247646407324800">"Αυτόματο GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Μόνο WCDMA"</item>
-    <item msgid="5714714953966979187">"Μόνο GSM"</item>
-    <item msgid="8508331239546115206">"Προτιμώνται GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Παγκόσμια"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Μόνο EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA χωρίς EvDo"</item>
+    <item msgid="4341433122263841224">"Αυτόματη επιλογή EvDo/CDMA"</item>
+    <item msgid="5958053792390386668">"Αυτόματη επιλογή GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Μόνο WCDMA"</item>
+    <item msgid="1524224863879435516">"Μόνο GSM"</item>
+    <item msgid="3817924849415716259">"Προτιμώνται GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Ενεργοποίηση δεδομένων"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Ενεργοποίηση της πρόσβασης δεδομένων μέσω του δικτύου κινητής τηλεφωνίας"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Θα σου τηλεφωνήσω αμέσως."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Θα σου τηλεφωνήσω αργότερα."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Δεν μπορώ τώρα. Πάρε με αργότερα."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Προσαρμοσμένο μήνυμα"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Συντάξτε τη δική σας…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Γρήγορες απαντήσεις"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Επεξεργασία γρήγορων απαντήσεων"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f3e9256..9ad4eaf 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Preferred network mode: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Preferred network mode: CDMA only"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferred network mode: EvDo only"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferred network mode: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Preferred network mode: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Preferred network mode: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferred network mode: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferred network mode: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferred network mode: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo only"</item>
-    <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo auto"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA auto"</item>
-    <item msgid="5189164180446264504">"WCDMA only"</item>
-    <item msgid="5714714953966979187">"GSM only"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA preferred"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo only"</item>
+    <item msgid="1508557726283094448">"CDMA w/o EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo auto"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA auto"</item>
+    <item msgid="7913148405605373434">"WCDMA only"</item>
+    <item msgid="1524224863879435516">"GSM only"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferred"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data enabled"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Enable data access over Mobile network"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"I\'ll call you right back."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"I\'ll call you later."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Can\'t talk now. Call me later?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Customised message"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Write your own..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Quick responses"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit quick responses"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -622,6 +628,5 @@
     <string name="ringtone_title" msgid="6374978286202084684">"Phone ringtone"</string>
     <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrate when ringing"</string>
     <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Dial pad touch tones"</string>
-    <!-- no translation found for preference_category_ringtone (5197960752529332721) -->
-    <skip />
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
 </resources>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2e3827b..df7f29b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Modo de red preferido: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Modo de red preferido: solo CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modo de red preferido: solo EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modo de red preferido: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Modo de red preferido: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Modo de red preferido: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Modo de red preferido: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de red preferido: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de red preferido: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de red preferido: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo solamente"</item>
-    <item msgid="454610224530856274">"CDMA sin EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automático"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automático"</item>
-    <item msgid="5189164180446264504">"WCDMA solamente"</item>
-    <item msgid="5714714953966979187">"GSM solamente"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA preferido"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo solamente"</item>
+    <item msgid="1508557726283094448">"CDMA sin EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automático"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automático"</item>
+    <item msgid="7913148405605373434">"WCDMA solamente"</item>
+    <item msgid="1524224863879435516">"GSM solamente"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferido"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Usar paquete de datos"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Activar acceso a datos para red móvil"</string>
@@ -352,7 +358,7 @@
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leyendo la tarjeta SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No hay contactos en tu tarjeta SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccionar contactos para importar"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Para importar contactos de la tarjeta SIM, desactiva primero el modo de avión."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Para importar contactos de la tarjeta SIM, desactiva primero el modo avión."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activar/desactivar PIN de tarjeta SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Cambiar PIN de tarjeta SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN de tarjeta SIM:"</string>
@@ -412,7 +418,7 @@
     <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
     <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Devolver llamada"</string>
     <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaje"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Para realizar una llamada, primero debes desactivar el modo de avión."</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No registrado en la red."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"La red móvil no está disponible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Llamada no enviada. No se ingresó un número válido."</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Te llamo enseguida."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Te llamo más tarde."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"No puedo hablar ahora. ¿Me llamas más tarde?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mensaje personalizado"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escribe tu propia respuesta..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respuestas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respuestas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index be30b4d..2513d19 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Preferencia de modo de red: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Modo de red preferido: solo CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modo de red preferida: solo EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modo de red preferido: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Modo de red preferido: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Modo de red preferido: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Modo de red preferido: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de red preferido: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de red preferido: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de red preferido: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Solo EvDo"</item>
-    <item msgid="454610224530856274">"CDMA sin EvDo"</item>
-    <item msgid="648505122852496166">"Modo automático de CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA (modo automático)"</item>
-    <item msgid="5189164180446264504">"Solo WCDMA"</item>
-    <item msgid="5714714953966979187">"Solo GSM"</item>
-    <item msgid="8508331239546115206">"Preferencia de GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Solo EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA sin EvDo"</item>
+    <item msgid="4341433122263841224">"Modo automático de CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA (modo automático)"</item>
+    <item msgid="7913148405605373434">"Solo WCDMA"</item>
+    <item msgid="1524224863879435516">"Solo GSM"</item>
+    <item msgid="3817924849415716259">"Preferencia de GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Habilitar datos"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Permitir el acceso a los datos a través de la red móvil"</string>
@@ -589,7 +595,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Te llamo en cuanto pueda."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Te llamo más tarde."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"No puedo hablar. Llámame luego."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mensaje personalizado"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escribe tu propia respuesta..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respuestas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respuestas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index eed3155..13d10f8 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Eelistatud võrgurežiim: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Eelistatud võrgurežiim: ainult CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Eelistatud võrgurežiim: ainult EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Eelistatud võrgurežiim: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Eelistatud võrgurežiim: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Eelistatud võrgurežiim: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Eelistatud võrgurežiim: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Eelistatud võrgurežiim: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Eelistatud võrgurežiim: globaalne"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Eelistatud võrgurežiim: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Ainult EvDo"</item>
-    <item msgid="454610224530856274">"CDMA ilma EvDo-ta"</item>
-    <item msgid="648505122852496166">"Automaatne CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Automaatne GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Ainult WCDMA"</item>
-    <item msgid="5714714953966979187">"Ainult GSM"</item>
-    <item msgid="8508331239546115206">"Eelistatud GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globaalne"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Ainult EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA ilma EvDo-ta"</item>
+    <item msgid="4341433122263841224">"Automaatne CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Automaatne GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Ainult WCDMA"</item>
+    <item msgid="1524224863879435516">"Ainult GSM"</item>
+    <item msgid="3817924849415716259">"Eelistatud GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Andmed lubatud"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Luba juurdepääs andmetele mobiilsidevõrgu kaudu"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Helistan kohe tagasi."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Helistan sulle hiljem."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Ei saa rääkida. Helistad hiljem?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Kohandatud sõnum"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kirjutage ise …"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Kiirvastused"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Kiirvastuste muutmine"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 23ed04b..dc62add 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"حالت شبکه ترجیحی: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"حالت شبکه برگزیده: فقط CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"حالت شبکه برگزیده: فقط EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"حالت شبکه برگزیده: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"حالت شبکه برگزیده: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"حالت شبکه برگزیده: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"حالت شبکه برگزیده: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"حالت شبکه برگزیده: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"حالت شبکه برگزیده: سراسری"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"حالت شبکه برگزیده: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"فقط EvDo"</item>
-    <item msgid="454610224530856274">"CDMA بدون EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo خودکار"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA خودکار"</item>
-    <item msgid="5189164180446264504">"فقط WCDMA"</item>
-    <item msgid="5714714953966979187">"فقط GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA برگزیده"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"سراسری"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"فقط EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA بدون EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo خودکار"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA خودکار"</item>
+    <item msgid="7913148405605373434">"فقط WCDMA"</item>
+    <item msgid="1524224863879435516">"فقط GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA برگزیده"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"داده‌ها فعال شدند"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"فعال کردن دسترسی داده از طریق شبکهٔ تلفن همراه"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"به زودی با شما تماس می‌گیرم."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"بعداً با شما تماس می‌گیرم."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"اکنون نمی‌توانم صحبت کنم. بعداً به من زنگ می‌زنید؟"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"پیام سفارشی"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"نوشتن پاسخ خود…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"پاسخ‌های سریع"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ویرایش پاسخ‌های سریع"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 91a18a6..3bfe7eb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Ensisijainen verkkotila: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Ensisijainen verkkotila: vain CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Ensisijainen verkkotila: vain EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Ensisijainen verkkotila: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Ensisijainen verkkotila: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Ensisijainen verkkotila: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Ensisijainen verkkotila: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Ensisijainen verkkotila: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Ensisijainen verkkotila: Maailmanlaajuinen"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Ensisijainen verkkotila: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Vain EvDo"</item>
-    <item msgid="454610224530856274">"CDMA ilman EvDo"</item>
-    <item msgid="648505122852496166">"Automaattinen CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Automaattinen GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Vain WCDMA"</item>
-    <item msgid="5714714953966979187">"Vain GSM"</item>
-    <item msgid="8508331239546115206">"Ensisijaisesti GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Maailmanlaajuinen"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Vain EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA ilman EvDoa"</item>
+    <item msgid="4341433122263841224">"Automaattinen CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Automaattinen GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Vain WCDMA"</item>
+    <item msgid="1524224863879435516">"Vain GSM"</item>
+    <item msgid="3817924849415716259">"Ensisijaisesti GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Tiedot käytössä"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Ota mobiiliverkon tiedonsiirto käyttöön"</string>
@@ -589,7 +595,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Soitan sinulle heti takaisin."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Soitan sinulle myöhemmin."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"En voi puhua nyt. Soita myöhemmin?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Oma viesti"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kirjoita oma…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Pikavastaukset"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Muokkaa pikavastausta"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9ca44e4..54d2700 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Mode réseau préféré : CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Mode réseau préféré : CDMA uniquement"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mode réseau préféré : EvDo uniquement"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mode réseau préféré : LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Mode réseau préféré : CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Mode réseau préféré : LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Mode réseau préféré : GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mode réseau préféré : CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mode réseau préféré : général"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mode réseau préféré : LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo uniquement"</item>
-    <item msgid="454610224530856274">"CDMA sans EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automatique"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automatique"</item>
-    <item msgid="5189164180446264504">"WCDMA uniquement"</item>
-    <item msgid="5714714953966979187">"GSM uniquement"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA préféré"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Général"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo uniquement"</item>
+    <item msgid="1508557726283094448">"CDMA sans EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automatique"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automatique"</item>
+    <item msgid="7913148405605373434">"WCDMA uniquement"</item>
+    <item msgid="1524224863879435516">"GSM uniquement"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA de préférence"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Données activées"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Activer l\'accès aux données sur le réseau mobile"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Je te rappelle tout de suite."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Je t\'appellerai plus tard."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Peux pas parler. On se rappelle ?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Message personnalisé"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Réponse personnalisée..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Réponses rapides"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Modifier les réponses rapides"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 21bd837..4b14174 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"पसंदीदा नेटवर्क मोड: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"पसंदीदा नेटवर्क मोड: केवल CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"पसंदीदा नेटवर्क मोड: केवल EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"पसंदीदा नेटवर्क मोड: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"पसंदीदा नेटवर्क मोड: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"पसंदीदा नेटवर्क मोड: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"पसंदीदा नेटवर्क मोड: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"पसंदीदा नेटवर्क मोड: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"पसंदीदा नेटवर्क मोड: वैश्विक"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"पसंदीदा नेटवर्क मोड: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"केवल EvDo"</item>
-    <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo स्वतः"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA स्वत:"</item>
-    <item msgid="5189164180446264504">"केवल WCDMA"</item>
-    <item msgid="5714714953966979187">"केवल GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA पसंदीदा"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"वैश्विक"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"केवल EvDo"</item>
+    <item msgid="1508557726283094448">"EvDo के बिना CDMA"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo स्वतः"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA स्वत:"</item>
+    <item msgid="7913148405605373434">"केवल WCDMA"</item>
+    <item msgid="1524224863879435516">"केवल GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA पसंदीदा"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"डेटा सक्षम किया गया"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"मोबाइल नेटवर्क पर डेटा पहुंच सक्षम करें"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"मैं आपको वापस कॉल करूंगा/करूंगी."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"मैं आपको बाद में कॉल करूंगा/करूंगी."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"अभी बात नहीं हो सकती. बाद में कॉल करें?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"कस्टम संदेश..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"अपना स्वयं का लिखें..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"त्वरित प्रतिसाद"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"त्वरित प्रतिसाद संपादित करें"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e6d9ef1..0bc84d4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Način željene mreže: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Način željene mreže: Samo CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Način željene mreže: Samo EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Način željene mreže: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Preferirani mrežni način: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Preferirani mrežni način: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Preferirani mrežni način: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferirani mrežni način: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferirani mrežni način: globalni"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferirani mrežni način: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Samo EvDo"</item>
-    <item msgid="454610224530856274">"CDMA sa/bez EvDo"</item>
-    <item msgid="648505122852496166">"Automatski CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Automatski GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Samo WCDMA"</item>
-    <item msgid="5714714953966979187">"Samo GSM"</item>
-    <item msgid="8508331239546115206">"Preporučeno GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globalno"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Samo EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA bez EvDo-a"</item>
+    <item msgid="4341433122263841224">"Automatski CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Automatski GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Samo WCDMA"</item>
+    <item msgid="1524224863879435516">"Samo GSM"</item>
+    <item msgid="3817924849415716259">"Preferirano GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Podaci su omogućeni"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Omogući podatkovni pristup preko mobilne mreže"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Nazvat ću vas odmah."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Zvat ću vas kasnije."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Sada ne mogu razgovarati. Nazovite me kasnije?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Prilagođena poruka"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napišite odgovor..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Brzi odgovori"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Uređivanje brzih odgovora"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index f94a7e5..977b30d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Preferált hálózati mód: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Preferált hálózati mód: csak CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferált hálózati mód: csak EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferált hálózati mód: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Preferált hálózati mód: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Preferált hálózati mód: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Preferált hálózati mód: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferált hálózati mód: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferált hálózati mód: globális"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferált hálózati mód: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Csak EvDo"</item>
-    <item msgid="454610224530856274">"CDMA EvDo nélkül"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automatikus"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automatikus"</item>
-    <item msgid="5189164180446264504">"Csak WCDMA"</item>
-    <item msgid="5714714953966979187">"Csak GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA a preferált"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globális"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Csak EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA EvDo nélkül"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automatikus"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automatikus"</item>
+    <item msgid="7913148405605373434">"Csak WCDMA"</item>
+    <item msgid="1524224863879435516">"Csak GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA a preferált"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Adatok engedélyezése"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Adathozzáférés engedélyezése mobilhálózatokon"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Hamarosan visszahívom."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Később visszahívom."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Most nem alkalmas. Hívna később?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Egyéni üzenet"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Saját válasz írása..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Gyors válaszok"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Gyors válaszok szerkesztése"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index afe30f5..15feca9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Mode jaringan yang disukai: : CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Mode jaringan pilihan: CDMA saja"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mode jaringan pilihan: EvDo saja"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mode jaringan pilihan: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Mode jaringan yang disukai: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Mode jaringan yang disukai: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Mode jaringan yang disukai: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mode jaringan yang disukai: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mode jaringan yang disukai: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mode jaringan yang disukai: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo saja"</item>
-    <item msgid="454610224530856274">"CDMA tanpa EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo otomatis"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA otomatis"</item>
-    <item msgid="5189164180446264504">"WCDMA saja"</item>
-    <item msgid="5714714953966979187">"GSM saja"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA lebih disukai"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo saja"</item>
+    <item msgid="1508557726283094448">"CDMA tanpa EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo otomatis"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA otomatis"</item>
+    <item msgid="7913148405605373434">"WCDMA saja"</item>
+    <item msgid="1524224863879435516">"GSM saja"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA lebih disukai"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data diaktifkan"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Aktifkan akses data pada jaringan Seluler"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Saya segera telepon balik."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Nanti saya telepon balik."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Tak bisa bicara skrg. Tlp lg nanti?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Pesan khusus"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Tulis respons Anda sendiri…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Tanggapan cepat"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit tanggapan cepat"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 9f464a4..4c11412 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Modalità di rete preferita: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Modalità di rete preferita: solo CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modalità di rete preferita: solo EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modalità di rete preferita: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Modalità di rete preferita: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Modalità di rete preferita: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Modalità di rete preferita: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modalità di rete preferita: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modalità di rete preferita: globale"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modalità di rete preferita: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Solo EvDo"</item>
-    <item msgid="454610224530856274">"CDMA senza EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automatico"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automatico"</item>
-    <item msgid="5189164180446264504">"Solo WCDMA"</item>
-    <item msgid="5714714953966979187">"Solo GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA preferito"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globale"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Solo EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA senza EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automatico"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automatico"</item>
+    <item msgid="7913148405605373434">"Solo WCDMA"</item>
+    <item msgid="1524224863879435516">"Solo GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferito"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dati attivati"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Attiva l\'accesso ai dati sulla rete cellulare"</string>
@@ -589,7 +595,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ti richiamo subito."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ti chiamo dopo."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Non posso parlare ora. Mi chiami dopo?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Messaggio personalizzato"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Scrivi risposta personale..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Risposte rapide"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Modifica risposte rapide"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0e430bb..17771ff 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"מצב רשת מועדפת: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"מצב רשת מועדפת: CDMA בלבד"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"מצב רשת מועדפת: EvDo בלבד"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"מצב רשת מועדפת: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"מצב רשת מועדף: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"מצב רשת מועדף: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"מצב רשת מועדף: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"מצב רשת מועדף: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"מצב רשת מועדף: גלובלי"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"מצב רשת מועדף: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo בלבד"</item>
-    <item msgid="454610224530856274">"CDMA ללא EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo אוטומטי"</item>
-    <item msgid="7148247646407324800">"GSM/‏WCDMA אוטומטי"</item>
-    <item msgid="5189164180446264504">"WCDMA בלבד"</item>
-    <item msgid="5714714953966979187">"GSM בלבד"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA מועדפת"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"גלובלי"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo בלבד"</item>
+    <item msgid="1508557726283094448">"CDMA ללא EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo אוטומטי"</item>
+    <item msgid="5958053792390386668">"GSM/‏WCDMA אוטומטי"</item>
+    <item msgid="7913148405605373434">"WCDMA בלבד"</item>
+    <item msgid="1524224863879435516">"GSM בלבד"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA מועדף"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"נתונים מופעלים"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"אפשר גישת נתונים ברשת לנייד"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"אני מיד חוזר אליך."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"אני אתקשר אליך יותר מאוחר."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"אני לא יכול לדבר עכשיו. תתקשר אלי מאוחר יותר?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"הודעה מותאמת אישית"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"כתוב אחת משלך..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"תגובות מהירות"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ערוך תגובות מהירות"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 657fc4f..23bb005 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"優先ネットワークモード: CDMA/EV-DO"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"優先ネットワークモード: CDMAのみ"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"優先ネットワークモード: EvDoのみ"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"優先ネットワークモード: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"優先ネットワークモード: CDMA/EV-DO/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"優先ネットワークモード: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"優先ネットワークモード: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"優先ネットワークモード: CDMA+LTE/EV-DO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"優先ネットワークモード: グローバル"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"優先ネットワークモード: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EV-DOのみ"</item>
-    <item msgid="454610224530856274">"CDMA（EV-DO非準拠）"</item>
-    <item msgid="648505122852496166">"CDMA/EV-DO自動"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA自動"</item>
-    <item msgid="5189164180446264504">"WCDMAのみ"</item>
-    <item msgid="5714714953966979187">"GSMのみ"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMAを優先"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"グローバル"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA+LTE/EV-DO"</item>
+    <item msgid="6389676313771670660">"CDMA/EV-DO/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EV-DOのみ"</item>
+    <item msgid="1508557726283094448">"CDMA（EV-DO非準拠）"</item>
+    <item msgid="4341433122263841224">"CDMA/EV-DO自動"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA自動"</item>
+    <item msgid="7913148405605373434">"WCDMAのみ"</item>
+    <item msgid="1524224863879435516">"GSMのみ"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMAを優先"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"データ通信を有効にする"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"モバイルネットワーク経由のデータアクセスを有効にする"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"すぐにかけ直します。"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"後でかけ直します。"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"今話せません。かけ直してください。"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"カスタムメッセージ"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"カスタム返信を作成..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"クイック返信"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"クイック返信の編集"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index dc0c7bc..0a0f80b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"기본 설정된 네트워크 모드: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"기본 네트워크 모드: CDMA 전용"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"기본 네트워크 모드: EvDo 전용"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"기본 네트워크 모드: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"기본 네트워크 모드: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"기본 네트워크 모드: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"기본 네트워크 모드: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"기본 네트워크 모드: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"기본 네트워크 모드: 글로벌"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"기본 네트워크 모드: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo 전용"</item>
-    <item msgid="454610224530856274">"EvDo없는 CDMA"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo 자동"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA 자동"</item>
-    <item msgid="5189164180446264504">"WCDMA 전용"</item>
-    <item msgid="5714714953966979187">"GSM 전용"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA로 기본 설정"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"글로벌"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA+LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo 전용"</item>
+    <item msgid="1508557726283094448">"CDMA(EvDo 없음)"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo 자동"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA 자동"</item>
+    <item msgid="7913148405605373434">"WCDMA 전용"</item>
+    <item msgid="1524224863879435516">"GSM 전용"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA로 기본 설정"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"데이터 사용"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"모바일 네트워크에서 데이터 액세스 사용"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"바로 다시 전화드리겠습니다."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"나중에 전화드리겠습니다."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"통화 불가. 나중에 전화주세요."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"맞춤 메시지"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"나만의 응답 작성…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"빠른 응답"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"빠른 응답 수정"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 79978f0..b1ff836 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Pageidaujamas tinklo režimas: CDMA / „EvDo“"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Pageidaujamas tinklo režimas: tik CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Pageidaujamas tinklo režimas: tik „EvDo“"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Pageidaujamas tinklo režimas: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Pageidaujamas tinklo režimas: CDMA / „EvDo“ / GSM / WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Pageidaujamas tinklo režimas: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Pageidaujamas tinklo režimas: GSM / WCDMA / LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Pageidaujamas tinklo režimas: CDMA ir LTE / EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Pageidaujamas tinklo režimas: pasaulinis"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Pageidaujamas tinklo režimas: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE / CDMA"</item>
-    <item msgid="3273348576277144124">"Tik EvDo"</item>
-    <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"CDMA / „EvDo“ automatinis"</item>
-    <item msgid="7148247646407324800">"GSM / WCDMA automatinis"</item>
-    <item msgid="5189164180446264504">"Tik WCDMA"</item>
-    <item msgid="5714714953966979187">"Tik GSM"</item>
-    <item msgid="8508331239546115206">"Pageidaujama GSM / WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE / CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Pasaulinis"</item>
+    <item msgid="127064712132619032">"GSM / WCDMA / LTE"</item>
+    <item msgid="1126767511633425977">"CDMA ir LTE / „EvDo“"</item>
+    <item msgid="6389676313771670660">"CDMA / „EvDo“ / GSM / WCDMA"</item>
+    <item msgid="545430093607698090">"Tik „EvDo“"</item>
+    <item msgid="1508557726283094448">"CDMA be „EvDo“"</item>
+    <item msgid="4341433122263841224">"CDMA / „EvDo“ automatinis"</item>
+    <item msgid="5958053792390386668">"GSM / WCDMA automatinis"</item>
+    <item msgid="7913148405605373434">"Tik WCDMA"</item>
+    <item msgid="1524224863879435516">"Tik GSM"</item>
+    <item msgid="3817924849415716259">"Pageidaujama GSM / WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Duomenys įgalinti"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Įgalinti duomenų prieigą mobiliajame tinkle"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Netrukus perskambinsiu."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Paskambinsiu vėliau."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Dabar negaliu kalb. Pask. vėliau."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Priskirtas pranešimas"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Sukurkite patys..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Greiti atsakai"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redaguoti greitus atsakus"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 8a44063..b9e35e7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Ieteicamais tīkla režīms: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Ieteicamais tīkla režīms: tikai CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Ieteicamais tīkla režīms: tikai EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Ieteicamais tīkla režīms: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Vēlamais tīkla režīms: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Vēlamais tīkla režīms: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Vēlamais tīkla režīms: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Vēlamais tīkla režīms: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Vēlamais tīkla režīms: Globāls"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Vēlamais tīkla režīms: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Tikai EvDo"</item>
-    <item msgid="454610224530856274">"CDMA bez EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automātiski"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automātiski"</item>
-    <item msgid="5189164180446264504">"Tikai WCDMA"</item>
-    <item msgid="5714714953966979187">"Tikai GSM"</item>
-    <item msgid="8508331239546115206">"Priekšroka GSM/WCDMA režīmam"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Vispārējs"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Tikai EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA bez EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automātiski"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automātiski"</item>
+    <item msgid="7913148405605373434">"Tikai WCDMA"</item>
+    <item msgid="1524224863879435516">"Tikai GSM"</item>
+    <item msgid="3817924849415716259">"Ieteicams GSM/WCDMA režīms"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dati ir iespējoti."</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Iespējot datu piekļuvi mobilajā tīklā"</string>
@@ -587,7 +593,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Tūlīt atzvanīšu."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Piezvanīšu vēlāk."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nevaru runāt. Vai piezvanīsi vēlāk?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Pielāgots ziņojums"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Rakstīt savu…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Ātrās atbildes"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Ātro atbilžu rediģēšana"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 1f6646b..c727ff0 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Mod rangkaian diutamakan: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Mod rangkaian pilihan: CDMA sahaja"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mod rangkaian pilihan: EvDo sahaja"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mod rangkaian pilihan: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Mod rangkaian pilihan: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Mod rangkaian pilihan: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Mod rangkaian pilihan: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mod rangkaian pilihan: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mod rangkaian pilihan: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mod rangkaian pilihan: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo sahaja"</item>
-    <item msgid="454610224530856274">"CDMA tanpa EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo auto"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA auto"</item>
-    <item msgid="5189164180446264504">"WCDMA sahaja"</item>
-    <item msgid="5714714953966979187">"GSM sahaja"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA diutamakan"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo sahaja"</item>
+    <item msgid="1508557726283094448">"CDMA tanpa EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo auto"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA auto"</item>
+    <item msgid="7913148405605373434">"WCDMA sahaja"</item>
+    <item msgid="1524224863879435516">"GSM sahaja"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA diutamakan"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data didayakan"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Dayakan akses data melalui rangkaian Mudah Alih"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Saya akn segera hubungi awak nanti."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Saya akan hubungi awak kemudian."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Tdk blh berckp skg. Tel saya nanti?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mesej peribadi"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Tulis sendiri…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respons pantas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit respons pantas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e574e75..158b7b9 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Foretrukket nettverksmodus: CMDA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Foretrukket nettverksmodus: kun CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Foretrukket nettverksmodus: kun EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Foretrukket nettverksmodus: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Foretrukket nettverksmodus: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Foretrukket nettverksmodus: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Foretrukket nettverksmodus: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Foretrukket nettverksmodus: CDMA + LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Foretrukket nettverksmodus: Overordnet"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Foretrukket nettverksmodus: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Kun EvDo"</item>
-    <item msgid="454610224530856274">"CDMA uten EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automatisk"</item>
-    <item msgid="7148247646407324800">"GSM / WCDMA automatisk"</item>
-    <item msgid="5189164180446264504">"Kun WCDMA"</item>
-    <item msgid="5714714953966979187">"Kun GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA foretrukket"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Overordnet"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Bare EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA uten EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automatisk"</item>
+    <item msgid="5958053792390386668">"GSM / WCDMA automatisk"</item>
+    <item msgid="7913148405605373434">"Bare WCDMA"</item>
+    <item msgid="1524224863879435516">"Bare GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA foretrukket"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data aktivert"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Aktiver datatilgang i mobilnettverk"</string>
@@ -591,7 +597,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Jeg ringer deg straks tilbake."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Jeg ringer deg senere."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Ikke nå. Ringer du meg senere?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Egendefinert melding"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv ditt eget"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hurtigsvar"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Rediger hurtigsvar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 71ebc81..bffaf74 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Voorkeursnetwerkmodus: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Voorkeursnetwerkmodus: alleen CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Voorkeursnetwerkmodus: alleen EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Voorkeursnetwerkmodus: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Voorkeursnetwerkmodus: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Voorkeursnetwerkmodus: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Voorkeursnetwerkmodus: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Voorkeursnetwerkmodus: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Voorkeursnetwerkmodus: Wereldwijd"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Voorkeursnetwerkmodus: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Alleen EvDo"</item>
-    <item msgid="454610224530856274">"CDMA zonder EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automatisch"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automatisch"</item>
-    <item msgid="5189164180446264504">"Alleen WCDMA"</item>
-    <item msgid="5714714953966979187">"Alleen GSM"</item>
-    <item msgid="8508331239546115206">"Voorkeur voor GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Wereldwijd"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Alleen EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA zonder EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automatisch"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automatisch"</item>
+    <item msgid="7913148405605373434">"Alleen WCDMA"</item>
+    <item msgid="1524224863879435516">"Alleen GSM"</item>
+    <item msgid="3817924849415716259">"Voorkeur voor GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Gegevenstoegang aan"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Gegevenstoegang via mobiel netwerk inschakelen"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ik bel je zo terug."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ik bel je later."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kan nu niet opnemen. Bel me later."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Aangepast bericht"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Eigen reactie opstellen..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Snelle reacties"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Snelle reacties bewerken"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index c545412..6bb58a2 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Preferowany tryb sieci: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Preferowany tryb sieci: tylko CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferowany tryb sieci: tylko EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferowany tryb sieci: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Preferowany tryb sieci: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Preferowany tryb sieci: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Preferowany tryb sieci: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferowany tryb sieci: CDMA + LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferowany tryb sieci: globalny"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferowany tryb sieci: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Tylko EvDo"</item>
-    <item msgid="454610224530856274">"CDMA bez EvDo"</item>
-    <item msgid="648505122852496166">"Automatyczny CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Automatyczny GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Tylko WCDMA"</item>
-    <item msgid="5714714953966979187">"Tylko GSM"</item>
-    <item msgid="8508331239546115206">"Preferowany GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globalny"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Tylko EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA bez EvDo"</item>
+    <item msgid="4341433122263841224">"Automatyczny CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Automatyczny GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Tylko WCDMA"</item>
+    <item msgid="1524224863879435516">"Tylko GSM"</item>
+    <item msgid="3817924849415716259">"Preferowany GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Włącz przesył danych"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Włącz przesył danych przez sieć komórkową"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Za chwilę do Ciebie oddzwonię."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Zadzwonię do Ciebie później."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nie mogę rozmawiać. Zadzwonisz później?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Wiadomość niestandardowa"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napisz własną..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Szybkie odpowiedzi"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edytuj szybkie odpowiedzi"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 1c24bf8..27bf0d4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Modo de rede preferido: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Modo de rede preferido: apenas CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modo de rede preferido: apenas EvDO"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modo de rede preferido: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Modo de rede preferido: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Modo de rede preferido: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Modo de rede preferido: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de rede preferido: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de rede preferido: global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de rede preferido: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Apenas EvDo"</item>
-    <item msgid="454610224530856274">"CDMA sem EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automático"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automático"</item>
-    <item msgid="5189164180446264504">"Apenas WCDMA"</item>
-    <item msgid="5714714953966979187">"Apenas GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA preferido"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Apenas EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA sem EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automático"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automático"</item>
+    <item msgid="7913148405605373434">"Apenas WCDMA"</item>
+    <item msgid="1524224863879435516">"Apenas GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferido"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dados ativados"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Activar acesso a dados através de rede móvel"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Telefono-lhe já a seguir."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Telefono-lhe mais tarde."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Pode telefonar-me mais tarde?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mensagem personalizada"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escrever a sua própria..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respostas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 7614949..c56f358 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Modo de rede de preferência: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Modo de rede preferencial: somente CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modo de rede preferencial: somente EvDO"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modo de rede preferencial: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Modo de rede preferencial: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Modo de rede preferencial: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Modo de rede preferencial: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Modo de rede preferencial: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Modo de rede preferencial: global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Modo de rede preferencial: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Somente EvDo"</item>
-    <item msgid="454610224530856274">"CDMA sem EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automático"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automático"</item>
-    <item msgid="5189164180446264504">"Somente WCDMA"</item>
-    <item msgid="5714714953966979187">"Somente GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA de preferência"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Somente EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA sem EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automático"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automático"</item>
+    <item msgid="7913148405605373434">"Somente WCDMA"</item>
+    <item msgid="1524224863879435516">"Somente GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferencial"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dados ativados"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Ativar acesso a dados pela rede móvel"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Já te ligo de volta."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Eu te ligo mais tarde."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Não posso falar agora. Me liga depois, por favor?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Personalizar mensagem"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Escreva sua resposta..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respostas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 56c78d1..e7602ae 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Mod de reţea preferat: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Mod de reţea preferat: numai CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mod de reţea preferat: numai EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mod de reţea preferat: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Mod de rețea preferat: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Mod de rețea preferat: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Mod de rețea preferat: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Mod de rețea preferat: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Mod de rețea preferat: Global"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Mod de rețea preferat: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Numai EvDo"</item>
-    <item msgid="454610224530856274">"CDMA fără EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo automat"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA automat"</item>
-    <item msgid="5189164180446264504">"Numai WCDMA"</item>
-    <item msgid="5714714953966979187">"Doar GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA preferată"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Global"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Numai EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA fără EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo automat"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA automat"</item>
+    <item msgid="7913148405605373434">"Numai WCDMA"</item>
+    <item msgid="1524224863879435516">"Numai GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA preferat"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Date activate"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Activaţi accesul de date prin reţeaua mobilă"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Te sun imediat înapoi."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Te sun mai târziu."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nu pot acum. Vorbim mai târziu?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mesaj personalizat"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Scrieți propriul răspuns…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Răspunsuri rapide"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editaţi răspunsurile rapide"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index efd2ed7..9485108 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Предпочтительная сеть: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Предпочтительная сеть: только CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Предпочтительная сеть: только EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Предпочтительная сеть: LTE или CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Предпочтительный режим: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Предпочтительный режим: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Предпочтительный режим: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Предпочтительный режим: CDMA и LTE/EvDo"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Предпочтительный режим: весь мир"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Предпочтительный режим: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Только EvDo"</item>
-    <item msgid="454610224530856274">"CDMA без EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo (авторежим)"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA (авторежим)"</item>
-    <item msgid="5189164180446264504">"Только WCDMA"</item>
-    <item msgid="5714714953966979187">"Только GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA (предпочтение)"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Весь мир"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA и LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Только EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA без EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo (авторежим)"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA (авторежим)"</item>
+    <item msgid="7913148405605373434">"Только WCDMA"</item>
+    <item msgid="1524224863879435516">"Только GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA (предпочтительно)"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Передача данных"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Разрешить передачу данных по сети мобильной связи"</string>
@@ -412,8 +418,8 @@
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Сеть не найдена"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Выбранная сеть (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недоступна."</string>
     <string name="notification_action_end_call" msgid="6069460915123531620">"Завершить разговор"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Перезвонить"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Сообщение"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Позвонить"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Написать"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Перед тем как звонить, отключите режим полета."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Нет регистрации в сети."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мобильная сеть недоступна."</string>
@@ -587,7 +593,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Я сейчас вам перезвоню."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Я перезвоню вам позже."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Не могу говорить. Позвоните позже."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Добавить сообщение"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Ваш ответ…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Быстрые ответы"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Быстрые ответы"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8f4863b..33fd717 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Preferovaný režim siete: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Preferovaný režim siete: iba CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferovaný režim siete: iba EVDO"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferovaný režim siete: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Preferovaný režim siete: CDMA / EvDo / GSM / WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Preferovaný režim siete: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Preferovaný režim siete: GSM / WCDMA / LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Preferovaný režim siete: CDMA + LTE / EvDo"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Preferovaný režim siete: Globálny"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Preferovaný režim siete: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE / CDMA"</item>
-    <item msgid="3273348576277144124">"Iba EvDo"</item>
-    <item msgid="454610224530856274">"CDMA bez EvDo"</item>
-    <item msgid="648505122852496166">"CDMA / EvDo – automaticky"</item>
-    <item msgid="7148247646407324800">"GSM / WCDMA – automaticky"</item>
-    <item msgid="5189164180446264504">"Iba WCDMA"</item>
-    <item msgid="5714714953966979187">"Iba GSM"</item>
-    <item msgid="8508331239546115206">"GSM / WCDMA – preferované"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE / CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globálny"</item>
+    <item msgid="127064712132619032">"GSM / WCDMA / LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE / EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA / EvDo / GSM / WCDMA"</item>
+    <item msgid="545430093607698090">"Iba EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA bez EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA / EvDo – automaticky"</item>
+    <item msgid="5958053792390386668">"GSM / WCDMA – automaticky"</item>
+    <item msgid="7913148405605373434">"Iba WCDMA"</item>
+    <item msgid="1524224863879435516">"Iba GSM"</item>
+    <item msgid="3817924849415716259">"GSM / WCDMA – preferované"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dátové prenosy aktivované"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Povolí dátový prístup prostredníctvom mobilnej siete"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Zavolám späť."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Zavolám neskôr."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Teraz nemôžem, zavolajte inokedy."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Vlastná správa"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napísať vlastnú..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Rýchle odpovede"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Upraviť rýchle odpovede"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9d80328..a51e4f3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Želeni način omrežja: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Prednostni način omrežja: samo CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Prednostni način omrežja: samo EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Prednostni način omrežja: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Prednostni način omrežja: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Prednostni način omrežja: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Prednostni način omrežja: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Prednostni način omrežja: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Prednostni način omrežja: globalno"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Prednostni način omrežja: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Samo EvDo"</item>
-    <item msgid="454610224530856274">"CDMA brez EvDo"</item>
-    <item msgid="648505122852496166">"Samodejno CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Samodejno GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Samo WCDMA"</item>
-    <item msgid="5714714953966979187">"Samo GSM"</item>
-    <item msgid="8508331239546115206">"Prednostno GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globalno"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Samo EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA brez EvDo"</item>
+    <item msgid="4341433122263841224">"Samodejno CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Samodejno GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Samo WCDMA"</item>
+    <item msgid="1524224863879435516">"Samo GSM"</item>
+    <item msgid="3817924849415716259">"Prednostno GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Podatki omogočeni"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Omogoči podatkovni dostop prek mobilnega omrežja"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Takoj bom poklical."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Poklical bom pozneje."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Zdaj ne morem govoriti. Pozneje?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Sporočilo po meri"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Napišite svoje besedilo …"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hitri odgovori"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Urejanje hitrih odgovorov"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5e82a3f..cd2989b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Жељени режим мреже: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Жељени режим мреже: само CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Жељени режим мреже: само EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Жељени режим мреже: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Жељени режим мреже: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Жељени режим мреже: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Жељени режим мреже: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Жељени режим мреже: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Жељени режим мреже: Глобално"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Жељени режим мреже: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Само EvDo"</item>
-    <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo аутоматски"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA аутоматски"</item>
-    <item msgid="5189164180446264504">"Само WCDMA"</item>
-    <item msgid="5714714953966979187">"Само GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA има предност"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Глобално"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Само EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA без EvDo-а"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo аутоматски"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA аутоматски"</item>
+    <item msgid="7913148405605373434">"Само WCDMA"</item>
+    <item msgid="1524224863879435516">"Само GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA има предност"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Подаци су омогућени"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Омогућава приступ подацима преко мобилне мреже"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Позваћу те ускоро."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Позваћу те касније."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"У гужви сам. Да се чујемо касније?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Прилагођена порука"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напишите сами…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Брзи одговори"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Измена брзих одговора"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5fe1f39..e690734 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Föredraget nätverksläge: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Föredraget nätverksläge: Endast CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Föredraget nätverksläge: Endast EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Föredraget nätverksläge: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Föredraget nätverksläge: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Föredraget nätverksläge: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Föredraget nätverksläge: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Föredraget nätverksläge: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Föredraget nätverksläge: globlat"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Föredraget nätverksläge: LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Endast EvDo"</item>
-    <item msgid="454610224530856274">"CDMA utan EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo auto"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA auto"</item>
-    <item msgid="5189164180446264504">"Endast WCDMA"</item>
-    <item msgid="5714714953966979187">"Endast GSM"</item>
-    <item msgid="8508331239546115206">"Föredrar GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Globalt"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Endast EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA utan EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo auto"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA auto"</item>
+    <item msgid="7913148405605373434">"Endast WCDMA"</item>
+    <item msgid="1524224863879435516">"Endast GSM"</item>
+    <item msgid="3817924849415716259">"Föredrar GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data är aktiverat"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Aktivera dataåtkomst via mobilt nätverk"</string>
@@ -591,7 +597,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Jag ringer tillbaka alldeles strax."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Jag ringer dig senare."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kan inte prata nu. Ring senare!"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Anpassat meddelande"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Skriv ett eget svar ..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Snabbsvar"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redigera snabbsvar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 88d01ca..13d9018 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Modi pendekezwa ya mtandao: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Modi pendekezwa ya mtandao: CDMA pekee"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modi pendekezwa ya mtandao:  EvDo pekee"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modi pendekezwa ya mtandao:  LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Hali ya mtandao inayopendelewa: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Hali ya mtandao inayopendelewa: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Hali ya mtandao inayopendelewa: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Hali ya mtandao inayopendelewa: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Hali ya mtandao inayopendelewa: Ulimwenguni Kote"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Hali ya mtandao inayopendelewa: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo tu"</item>
-    <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo otomatiki"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA otomatiki"</item>
-    <item msgid="5189164180446264504">"WCDMA tu"</item>
-    <item msgid="5714714953966979187">"GSM tu"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA inapendelewa"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Ulimwenguni Kote"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo pekee"</item>
+    <item msgid="1508557726283094448">"CDMA w/o EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo otomatiki"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA otomatiki"</item>
+    <item msgid="7913148405605373434">"WCDMA pekee"</item>
+    <item msgid="1524224863879435516">"GSM pekee"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA inapendelewa"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data imewezeshwa"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Wezesha mfiko wa data kupitia mtandao wa Simu"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Nitakupigia mara moja."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Nitakupigia baadaye."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Siwezi kuongea sasa. Nipigie baadaye?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Ujumbe maalum"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Andika yako binafsi..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Majibu ya haraka"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hariri majibu ya haraka"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 44534ee..71d93c4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"โหมดเครือข่ายที่ต้องการ: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"โหมดเครือข่ายที่ต้องการ: CDMA เท่านั้น"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"โหมดเครือข่ายที่ต้องการ: EvDo เท่านั้น"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"โหมดเครือข่ายที่ต้องการ: LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"โหมดเครือข่ายที่ต้องการ: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"โหมดเครือข่ายที่ต้องการ: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"โหมดเครือข่ายที่ต้องการ: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"โหมดเครือข่ายที่ต้องการ: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"โหมดเครือข่ายที่ต้องการ: ทั่วโลก"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"โหมดเครือข่ายที่ต้องการ: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo เท่านั้น"</item>
-    <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo อัตโนมัติ"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA อัตโนมัติ"</item>
-    <item msgid="5189164180446264504">"WCDMA เท่านั้น"</item>
-    <item msgid="5714714953966979187">"GSM เท่านั้น"</item>
-    <item msgid="8508331239546115206">"ต้องการ GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"ทั่วโลก"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo เท่านั้น"</item>
+    <item msgid="1508557726283094448">"CDMA ที่ไม่มี EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo อัตโนมัติ"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA อัตโนมัติ"</item>
+    <item msgid="7913148405605373434">"WCDMA เท่านั้น"</item>
+    <item msgid="1524224863879435516">"GSM เท่านั้น"</item>
+    <item msgid="3817924849415716259">"ต้องการ GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"เปิดใช้งานข้อมูลแล้ว"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"เปิดใช้งานการเข้าถึงข้อมูลบนเครือข่ายมือถือ"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"เดี๋ยวจะโทรกลับทันที"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"เดี๋ยวจะโทรหาทีหลัง"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"ตอนนี้คุยไม่ได้ โทรมาใหม่ได้ไหม"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"ข้อความที่กำหนดเอง"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"เขียนคำตอบของคุณเอง..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"คำตอบด่วน"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"แก้ไขคำตอบด่วน"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index adcf741..9fe951f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Mas gustong mode ng network: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Mas gustong mode ng network: CDMA lamang"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mas gustong mode ng network: EvDo lamang"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mas gustong mode ng network: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Gustong mode ng network: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Gustong mode ng network: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Gustong mode ng network: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Gustong mode ng network: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Gustong mode ng network: Pangkalahatan"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Gustong mode ng network: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"EvDo lang"</item>
-    <item msgid="454610224530856274">"CDMA na walang EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo auto"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA auto"</item>
-    <item msgid="5189164180446264504">"WCDMA lang"</item>
-    <item msgid="5714714953966979187">"GSM lang"</item>
-    <item msgid="8508331239546115206">"Ninanais ng GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Pangkalahatan"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"EvDo lang"</item>
+    <item msgid="1508557726283094448">"CDMA na walang EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo auto"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA auto"</item>
+    <item msgid="7913148405605373434">"WCDMA lang"</item>
+    <item msgid="1524224863879435516">"GSM lang"</item>
+    <item msgid="3817924849415716259">"Ninanais ang GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Pinagana ang data"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Paganahin ang access sa data sa Mobile network"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Tawagan kita ulit."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Tawagan kita mamaya."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Di masagot ngayon. Tawag ka mamaya?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Custom na mensahe"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Sumulat ng sarili mong tugon…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Mga mabilisang tugon"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"I-edit ang mga mabilisang tugon"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1dd4a89..3f27eca 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Tercih edilen ağ modu: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Tercih edilen ağ modu: Yalnızca CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Tercih edilen ağ modu: Yalnızca EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Tercih edilen ağ modu: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Tercih edilen ağ modu: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Tercih edilen ağ modu: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Tercih edilen ağ modu: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Tercih edilen ağ modu: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Tercih edilen ağ modu: Dünya Genelinde"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Tercih edilen ağ modu: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Yalnızca EvDo"</item>
-    <item msgid="454610224530856274">"EvDo olmadan CDMA"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo otomatik"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA otomatik"</item>
-    <item msgid="5189164180446264504">"Yalnızca WCDMA"</item>
-    <item msgid="5714714953966979187">"Yalnızca GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA tercih edilen"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Dünya Genelinde"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Yalnızca EvDo"</item>
+    <item msgid="1508557726283094448">"EvDo olmadan CDMA"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo otomatik"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA otomatik"</item>
+    <item msgid="7913148405605373434">"Yalnızca WCDMA"</item>
+    <item msgid="1524224863879435516">"Yalnızca GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA tercih edilen"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Veri etkin"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Mobil ağ üzerinden veri erişimini etkinleştir"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Seni hemen geri arayacağım."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Seni daha sonra ararım."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Şimdi konuşamam. Daha sonra arar mısın?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Özel mesaj"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Kendi yanıtınızı oluşturun…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hızlı yanıtlar"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hızlı yanıtları düzenle"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index aedf4fd..965d8d1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Рекомендований режим мереж: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Рекомендований режим мереж: лише CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Рекомендований режим мереж: лише EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Рекомендований режим мереж: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Рекомендований режим мережі: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Рекомендований режим мережі: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Рекомендований режим мережі: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Рекомендований режим мережі: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Рекомендований режим мережі: загальний"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Рекомендований режим мережі: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Лише EvDo"</item>
-    <item msgid="454610224530856274">"CDMA без EvDo"</item>
-    <item msgid="648505122852496166">"Авто CDMA/EvDo"</item>
-    <item msgid="7148247646407324800">"Авто GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Лише WCDMA"</item>
-    <item msgid="5714714953966979187">"Лише GSM"</item>
-    <item msgid="8508331239546115206">"Бажано GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Загальний"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Лише EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA без EvDo"</item>
+    <item msgid="4341433122263841224">"Авто CDMA/EvDo"</item>
+    <item msgid="5958053792390386668">"Авто GSM/WCDMA"</item>
+    <item msgid="7913148405605373434">"Лише WCDMA"</item>
+    <item msgid="1524224863879435516">"Лише GSM"</item>
+    <item msgid="3817924849415716259">"Рекомендовано GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Передавання даних"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Дозволити передавання даних через мобільну мережу"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Я зараз передзвоню."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Я передзвоню пізніше."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Не можу говорити. Передзвоніть."</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Спеціальне повідомлення"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Напишіть власну відповідь..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Швидкі відповіді"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Редагувати швидкі відповіді"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1ba7904..b610d9b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Chế độ mạng được ưa thích: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Chế độ mạng được ưa thích: chỉ CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Chế độ mạng được ưa thích: chỉ EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Chế độ mạng được ưa thích: LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Chế độ mạng được ưa thích: CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Chế độ mạng được ưa thích: LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Chế độ mạng được ưa thích: GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Chế độ mạng được ưa thích: CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Chế độ mạng được ưa thích: Toàn cầu"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Chế độ mạng được ưa thích: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Chỉ EvDo"</item>
-    <item msgid="454610224530856274">"CDMA không có EvDo"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo tự động"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA tự động"</item>
-    <item msgid="5189164180446264504">"Chỉ WCDMA"</item>
-    <item msgid="5714714953966979187">"Chỉ GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA được ưa thích"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"Toàn cầu"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"Chỉ EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA không có EvDo"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo tự động"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA tự động"</item>
+    <item msgid="7913148405605373434">"Chỉ WCDMA"</item>
+    <item msgid="1524224863879435516">"Chỉ GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA được ưa thích"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Đã bật dữ liệu"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Bật truy cập dữ liệu qua mạng Di động"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Tôi sẽ gọi lại ngay."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Tôi sẽ gọi lại sau."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Giờ tôi ko thể nói chuyện. Gọi sau nhé?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Thông báo tùy chỉnh"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Viết trả lời của riêng bạn…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Trả lời nhanh"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Chỉnh sửa trả lời nhanh"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5823d22..906b2fe 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"首选网络模式：CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"首选网络模式：仅限 CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"首选网络模式：仅限 EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"首选网络模式：LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"首选网络模式：CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"首选网络模式：LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"首选网络模式：GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"首选网络模式：CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"首选网络模式：通用"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"首选网络模式：LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"仅 EvDo"</item>
-    <item msgid="454610224530856274">"CDMA，无 EvDo 功能"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo 自动选择"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA 自动选择"</item>
-    <item msgid="5189164180446264504">"仅 WCDMA"</item>
-    <item msgid="5714714953966979187">"仅 GSM"</item>
-    <item msgid="8508331239546115206">"首选 GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"通用"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"仅 EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA，无 EvDo 功能"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo 自动选择"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA 自动选择"</item>
+    <item msgid="7913148405605373434">"仅 WCDMA"</item>
+    <item msgid="1524224863879435516">"仅 GSM"</item>
+    <item msgid="3817924849415716259">"首选 GSM/WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"启用数据网络"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"允许通过移动网络存取数据"</string>
@@ -585,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"我马上会打给你。"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"我稍后会再打给你。"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"现在无法接听。能稍后再打给我吗？"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"自定义短信"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"自行撰写回复…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"快速回复"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"修改快速回复"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5b51e47..31c3277 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"慣用網路模式：CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"慣用網路模式：僅限 CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"慣用網路模式：僅限 EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"慣用網路模式：LTE / CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"慣用網路模式：CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"慣用網路模式：LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"慣用網路模式：GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"慣用網路模式：CDMA + LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"慣用網路模式：通用"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"慣用網路模式：LTE/WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"僅限 EvDo"</item>
-    <item msgid="454610224530856274">"CDMA (不具 EvDo)"</item>
-    <item msgid="648505122852496166">"CDMA/EvDo 自動切換"</item>
-    <item msgid="7148247646407324800">"GSM/WCDMA 自動切換"</item>
-    <item msgid="5189164180446264504">"僅限 WCDMA"</item>
-    <item msgid="5714714953966979187">"僅限 GSM"</item>
-    <item msgid="8508331239546115206">"GSM/WCDMA 優先使用"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"LTE/WCDMA"</item>
+    <item msgid="577652050447385699">"LTE"</item>
+    <item msgid="6813597571293773656">"通用"</item>
+    <item msgid="127064712132619032">"GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"僅限 EvDo"</item>
+    <item msgid="1508557726283094448">"CDMA (不具 EvDo)"</item>
+    <item msgid="4341433122263841224">"CDMA/EvDo 自動切換"</item>
+    <item msgid="5958053792390386668">"GSM/WCDMA 自動切換"</item>
+    <item msgid="7913148405605373434">"僅限 WCDMA"</item>
+    <item msgid="1524224863879435516">"僅限 GSM"</item>
+    <item msgid="3817924849415716259">"GSM/WCDMA 優先"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"已啟用資料"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"啟用行動數據服務網路"</string>
@@ -591,7 +597,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"我待會就回電。"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"我晚點回電。"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"我現在不方便通話，晚點再打來好嗎？"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"自訂訊息"</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"自行撰寫回應…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"快速回應"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"編輯快速回應"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index c090be3..6713c6e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -167,20 +167,26 @@
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Imodi yenethiwekhi ekhethwayo: i-CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Imodi yenethiwekhi ekhethwayo: i-CDMA kuphela"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Imodi yenethiwekhi ekhethwayo: i-EvDo kuphela"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Imodi yenethiwekhi ekhethwayo: i-LTE/CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="4726682079415227330">"Imodi yenethiwekhi ekhethwayo: i-CDMA/EvDo/GSM/WCDMA"</string>
+    <string name="preferred_network_mode_lte_summary" msgid="574752287596469136">"Imodi yenethiwekhi ekhethwayo: i-LTE"</string>
+    <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="8455358514068283935">"Imodi yenethiwekhi ekhethwayo: i-GSM/WCDMA/LTE"</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Imodi yenethiwekhi ekhethwayo: i-CDMA+LTE/EVDO"</string>
+    <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Imodi yenethiwekhi ekhethwayo: Umhlaba jikelele"</string>
+    <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Imodi yenethiwekhi ekhethwayo: i-LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5543794538185064048">"LTE / CDMA"</item>
-    <item msgid="3273348576277144124">"I-EvDo kuphela"</item>
-    <item msgid="454610224530856274">"I_CDMA w/o EvDo"</item>
-    <item msgid="648505122852496166">"I-CDMA / EvDo ezenzakalelayo"</item>
-    <item msgid="7148247646407324800">"Okuzenzakalelayo kwe-GSM /WCDMA"</item>
-    <item msgid="5189164180446264504">"I-WCDMA entsha"</item>
-    <item msgid="5714714953966979187">"I-GSM kuphela"</item>
-    <item msgid="8508331239546115206">"Okukhethwayo kwe-GSM / WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7002474529872452266">"LTE / CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item msgid="7886739962255042385">"I-LTE / WCDMA"</item>
+    <item msgid="577652050447385699">"I-LTE"</item>
+    <item msgid="6813597571293773656">"Emhlabeni jikelele"</item>
+    <item msgid="127064712132619032">"I-GSM/WCDMA/LTE"</item>
+    <item msgid="1126767511633425977">"I-CDMA + LTE/EvDo"</item>
+    <item msgid="6389676313771670660">"I-CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="545430093607698090">"I-EvDo kuphela"</item>
+    <item msgid="1508557726283094448">"I-CDMA w/o EvDo"</item>
+    <item msgid="4341433122263841224">"I-CDMA / EvDo ezenzakalelayo"</item>
+    <item msgid="5958053792390386668">"Okuzenzakalelayo kwe-GSM /WCDMA"</item>
+    <item msgid="7913148405605373434">"I-WCDMA kuphela"</item>
+    <item msgid="1524224863879435516">"I-GSM kuphela"</item>
+    <item msgid="3817924849415716259">"Okukhethwayo kwe-GSM / WCDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Idatha ivunyelwe"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Vumela ukufinyelela idatha phezu kwenethiwekhi yeFoni"</string>
@@ -589,7 +595,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">" Ngizophinde ngikushayele ucingo."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ngizokushayela ucingo emva kwesikhathi"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Angikwazi ukukhuluma okwamanje. Ngicela uphinde ungishayele ucingo kamuva?"</string>
-    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Umlayezo ngokwezifiso..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Bhala okwakho…"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Izimpendulo ezisheshayo"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hlela izimpendulo ezisheshayo"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6a9de65..b03caba 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml

@@ -1293,7 +1293,7 @@
     <!-- Canned response for the "Respond via SMS" feature for incoming calls. [CHAR LIMIT=35] -->
     <string name="respond_via_sms_canned_response_4">Can\'t talk now. Call me later?</string>
     <!-- "Respond via SMS" option that lets you compose a custom response. [CHAR LIMIT=30] -->
-    <string name="respond_via_sms_custom_message">Custom message</string>
+    <string name="respond_via_sms_custom_message">Write your own...</string>
 
     <!-- Title of settings screen for managing the "Respond via SMS" feature. [CHAR LIMIT=30] -->
     <string name="respond_via_sms_setting_title">Quick responses</string>

diff --git a/res/xml/network_setting.xml b/res/xml/network_setting.xml
index b24b82c..7fd00fc 100644
--- a/res/xml/network_setting.xml
+++ b/res/xml/network_setting.xml

@@ -35,16 +35,6 @@
         android:summaryOn="@string/roaming_enable"
         android:summaryOff="@string/roaming_disable"/>
 
-    <PreferenceScreen
-        android:key="button_data_usage_key"
-        android:title="@string/throttle_data_usage"
-        android:persistent="false">
-
-        <intent android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.DataUsage" />
-    </PreferenceScreen>
-
     <ListPreference
         android:key="preferred_network_mode_key"
         android:title="@string/preferred_network_mode_title"

diff --git a/src/com/android/phone/CallCard.java b/src/com/android/phone/CallCard.java
index 80b6fd8..7812993 100644
--- a/src/com/android/phone/CallCard.java
+++ b/src/com/android/phone/CallCard.java

@@ -1309,6 +1309,14 @@
             displayName = PhoneUtils.getPresentationString(getContext(), presentation);
         }
 
+        // TODO: Revisit/cleanup following code when underlying telephony issue
+        // is fixed (b/7705977).
+        //
+        // Following logic was added to prevent screen flicker caused by receiving
+        // a momentary disconnect with only a stripped phone number (the phone
+        // would quickly flip between full caller info, stripped phone number, and
+        // back to full caller info). Note this only prevents the name/number/label
+        // fields from flickering--the phone state field will still briefly flicker.
         boolean updateNameAndNumber = true;
         // If the new info is just a phone number, check to make sure it's not less
         // information than what's already being displayed.
@@ -1339,14 +1347,14 @@
             }
             mName.setVisibility(View.VISIBLE);
 
-            if (displayNumber != null && !call.isGeneric()) {
+            if (!TextUtils.isEmpty(displayNumber) && !call.isGeneric()) {
                 mPhoneNumber.setText(displayNumber);
                 mPhoneNumber.setVisibility(View.VISIBLE);
             } else {
                 mPhoneNumber.setVisibility(View.GONE);
             }
 
-            if (label != null && !call.isGeneric()) {
+            if (!TextUtils.isEmpty(label) && !call.isGeneric()) {
                 mLabel.setText(label);
                 mLabel.setVisibility(View.VISIBLE);
             } else {

diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index ffed7b3..e301ea3 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java

@@ -120,9 +120,9 @@
     // choose another VM provider
     public static final String SIGNOUT_EXTRA = "com.android.phone.Signout";
     //Information about logical "up" Activity
-    private static final String UP_ACTIVITY_PACKAGE = "com.android.contacts";
+    private static final String UP_ACTIVITY_PACKAGE = "com.android.dialer";
     private static final String UP_ACTIVITY_CLASS =
-            "com.android.contacts.activities.DialtactsActivity";
+            "com.android.dialer.DialtactsActivity";
 
     // Used to tell the saving logic to leave forwarding number as is
     public static final CallForwardInfo[] FWD_SETTINGS_DONT_TOUCH = null;
@@ -204,10 +204,6 @@
     // Phone.TTY_MODE_xxx
     static final int preferredTtyMode = Phone.TTY_MODE_OFF;
 
-    // Dtmf tone types
-    static final int DTMF_TONE_TYPE_NORMAL = 0;
-    static final int DTMF_TONE_TYPE_LONG   = 1;
-
     public static final String HAC_KEY = "HACSetting";
     public static final String HAC_VAL_ON = "ON";
     public static final String HAC_VAL_OFF = "OFF";
@@ -1765,7 +1761,7 @@
 
         if (mButtonDTMF != null) {
             int dtmf = Settings.System.getInt(getContentResolver(),
-                    Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, DTMF_TONE_TYPE_NORMAL);
+                    Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, Constants.DTMF_TONE_TYPE_NORMAL);
             mButtonDTMF.setValueIndex(dtmf);
         }
 

diff --git a/src/com/android/phone/CallLogAsync.java b/src/com/android/phone/CallLogAsync.java
deleted file mode 100644
index 5a64a80..0000000
--- a/src/com/android/phone/CallLogAsync.java
+++ /dev/null

@@ -1,233 +0,0 @@
-/*
- * Copyright (C) 2010 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;
-import android.content.Context;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Looper;
-import android.provider.CallLog.Calls;
-import android.util.Log;
-import com.android.internal.telephony.CallerInfo;
-
-/**
- * Class to access the call logs database asynchronously since
- * database ops can take a long time depending on the system's load.
- * It uses AsyncTask which has its own thread pool.
- *
- * <pre class="prettyprint">
- * Typical usage:
- * ==============
- *
- *  // From an activity...
- *  String mLastNumber = "";
- *
- *  CallLogAsync log = new CallLogAsync();
- *
- *  CallLogAsync.AddCallArgs addCallArgs = new CallLogAsync.AddCallArgs(
- *      this, ci, number, presentation, type, timestamp, duration);
- *
- *  log.addCall(addCallArgs);
- *
- *  CallLogAsync.GetLastOutgoingCallArgs lastCallArgs = new CallLogAsync.GetLastOutgoingCallArgs(
- *      this, new CallLogAsync.OnLastOutgoingCallComplete() {
- *               public void lastOutgoingCall(String number) { mLastNumber = number; }
- *            });
- *  log.getLastOutgoingCall(lastCallArgs);
- * </pre>
- *
- */
-
-public class CallLogAsync {
-    private static final String TAG = "CallLogAsync";
-
-    /**
-     * Parameter object to hold the args to add a call in the call log DB.
-     */
-    public static class AddCallArgs {
-        /**
-         * @param ci               CallerInfo.
-         * @param number           To be logged.
-         * @param presentation     Of the number.
-         * @param callType         The type of call (e.g INCOMING_TYPE). @see
-         *                         android.provider.CallLog for the list of values.
-         * @param timestamp        Of the call (millisecond since epoch).
-         * @param durationInMillis Of the call (millisecond).
-         */
-        public AddCallArgs(Context context,
-                           CallerInfo ci,
-                           String number,
-                           int presentation,
-                           int callType,
-                           long timestamp,
-                           long durationInMillis) {
-            // Note that the context is passed each time. We could
-            // have stored it in a member but we've run into a bunch
-            // of memory leaks in the past that resulted from storing
-            // references to contexts in places that were long lived
-            // when the contexts were expected to be short lived. For
-            // example, if you initialize this class with an Activity
-            // instead of an Application the Activity can't be GCed
-            // until this class can, and Activities tend to hold
-            // references to large amounts of RAM for things like the
-            // bitmaps in their views.
-            //
-            // Having hit more than a few of those bugs in the past
-            // we've grown cautious of storing references to Contexts
-            // when it's not very clear that the thing holding the
-            // references is tightly tied to the Context, for example
-            // Views the Activity is displaying.
-
-            this.context = context;
-            this.ci = ci;
-            this.number = number;
-            this.presentation = presentation;
-            this.callType = callType;
-            this.timestamp = timestamp;
-            this.durationInSec = (int)(durationInMillis / 1000);
-        }
-        // Since the members are accessed directly, we don't use the
-        // mXxxx notation.
-        public final Context context;
-        public final CallerInfo ci;
-        public final String number;
-        public final int presentation;
-        public final int callType;
-        public final long timestamp;
-        public final int durationInSec;
-    }
-
-    /**
-     * Parameter object to hold the args to get the last outgoing call
-     * from the call log DB.
-     */
-    public static class GetLastOutgoingCallArgs {
-        public GetLastOutgoingCallArgs(Context context,
-                                       OnLastOutgoingCallComplete callback) {
-            this.context = context;
-            this.callback = callback;
-        }
-        public final Context context;
-        public final OnLastOutgoingCallComplete callback;
-    }
-
-    /**
-     * Non blocking version of CallLog.addCall(...)
-     */
-    public AsyncTask addCall(AddCallArgs args) {
-        assertUiThread();
-        return new AddCallTask().execute(args);
-    }
-
-    /** Interface to retrieve the last dialed number asynchronously. */
-    public interface OnLastOutgoingCallComplete {
-        /** @param number The last dialed number or an empty string if
-         *                none exists yet. */
-        void lastOutgoingCall(String number);
-    }
-
-    /**
-     * CallLog.getLastOutgoingCall(...)
-     */
-    public AsyncTask getLastOutgoingCall(GetLastOutgoingCallArgs args) {
-        assertUiThread();
-        return new GetLastOutgoingCallTask(args.callback).execute(args);
-    }
-
-    /**
-     * AsyncTask to save calls in the DB.
-     */
-    private class AddCallTask extends AsyncTask<AddCallArgs, Void, Uri[]> {
-        @Override
-        protected Uri[] doInBackground(AddCallArgs... callList) {
-            int count = callList.length;
-            Uri[] result = new Uri[count];
-            for (int i = 0; i < count; i++) {
-                AddCallArgs c = callList[i];
-
-                try {
-                    // May block.
-                    result[i] = Calls.addCall(
-                            c.ci, c.context, c.number, c.presentation,
-                            c.callType, c.timestamp, c.durationInSec);
-                } catch (Exception e) {
-                    // This must be very rare but may happen in legitimate cases.
-                    // e.g. If the phone is encrypted and thus write request fails, it may
-                    // cause some kind of Exception (right now it is IllegalArgumentException, but
-                    // might change).
-                    //
-                    // We don't want to crash the whole process just because of that.
-                    // Let's just ignore it and leave logs instead.
-                    Log.e(TAG, "Exception raised during adding CallLog entry: " + e);
-                    result[i] = null;
-                }
-            }
-            return result;
-        }
-
-        // Perform a simple sanity check to make sure the call was
-        // written in the database. Typically there is only one result
-        // per call so it is easy to identify which one failed.
-        @Override
-        protected void onPostExecute(Uri[] result) {
-            for (Uri uri : result) {
-                if (uri == null) {
-                    Log.e(TAG, "Failed to write call to the log.");
-                }
-            }
-        }
-    }
-
-    /**
-     * AsyncTask to get the last outgoing call from the DB.
-     */
-    private class GetLastOutgoingCallTask extends AsyncTask<GetLastOutgoingCallArgs, Void, String> {
-        private final OnLastOutgoingCallComplete mCallback;
-        private String mNumber;
-        public GetLastOutgoingCallTask(OnLastOutgoingCallComplete callback) {
-            mCallback = callback;
-        }
-
-        // Happens on a background thread. We cannot run the callback
-        // here because only the UI thread can modify the view
-        // hierarchy (e.g enable/disable the dial button). The
-        // callback is ran rom the post execute method.
-        @Override
-        protected String doInBackground(GetLastOutgoingCallArgs... list) {
-            int count = list.length;
-            String number = "";
-            for (GetLastOutgoingCallArgs args : list) {
-                // May block. Select only the last one.
-                number = Calls.getLastOutgoingCall(args.context);
-            }
-            return number;  // passed to the onPostExecute method.
-        }
-
-        // Happens on the UI thread, it is safe to run the callback
-        // that may do some work on the views.
-        @Override
-        protected void onPostExecute(String number) {
-            assertUiThread();
-            mCallback.lastOutgoingCall(number);
-        }
-    }
-
-    private void assertUiThread() {
-        if (!Looper.getMainLooper().equals(Looper.myLooper())) {
-            throw new RuntimeException("Not on the UI thread!");
-        }
-    }
-}

diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 99636df..a356db7 100755
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java

@@ -29,6 +29,7 @@
 import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
 import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
 import com.android.internal.telephony.cdma.SignalToneUtil;
+import com.android.phone.common.CallLogAsync;
 
 import android.app.ActivityManagerNative;
 import android.bluetooth.BluetoothAdapter;

diff --git a/src/com/android/phone/Constants.java b/src/com/android/phone/Constants.java
index 344e0c6..3e10c3a 100644
--- a/src/com/android/phone/Constants.java
+++ b/src/com/android/phone/Constants.java

@@ -139,4 +139,8 @@
     // (Currently they're all over the place: InCallScreen,
     // OutgoingCallBroadcaster, OtaUtils, etc.)
     //
+
+    // Dtmf tone type setting value for CDMA phone
+    public static final int DTMF_TONE_TYPE_NORMAL = 0;
+    public static final int DTMF_TONE_TYPE_LONG   = 1;
 }

diff --git a/src/com/android/phone/DTMFTwelveKeyDialer.java b/src/com/android/phone/DTMFTwelveKeyDialer.java
index 826d66c..4afac55 100644
--- a/src/com/android/phone/DTMFTwelveKeyDialer.java
+++ b/src/com/android/phone/DTMFTwelveKeyDialer.java

@@ -39,6 +39,7 @@
 
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyCapabilities;
 
 import java.util.HashMap;
@@ -952,7 +953,7 @@
 
         // Read the settings as it may be changed by the user during the call
         Phone phone = mCM.getFgPhone();
-        mShortTone = PhoneUtils.useShortDtmfTones(phone, phone.getContext());
+        mShortTone = useShortDtmfTones(phone, phone.getContext());
 
         // Before we go ahead and start a tone, we need to make sure that any pending
         // stop-tone message is processed.
@@ -1089,4 +1090,30 @@
             sendShortDtmfToNetwork(dtmfChar);
         }
     }
+
+    /**
+     * On GSM devices, we never use short tones.
+     * On CDMA devices, it depends upon the settings.
+     */
+    private static boolean useShortDtmfTones(Phone phone, Context context) {
+        int phoneType = phone.getPhoneType();
+        if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
+            return false;
+        } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
+            int toneType = android.provider.Settings.System.getInt(
+                    context.getContentResolver(),
+                    Settings.System.DTMF_TONE_TYPE_WHEN_DIALING,
+                    Constants.DTMF_TONE_TYPE_NORMAL);
+            if (toneType == Constants.DTMF_TONE_TYPE_NORMAL) {
+                return true;
+            } else {
+                return false;
+            }
+        } else if (phoneType == PhoneConstants.PHONE_TYPE_SIP) {
+            return false;
+        } else {
+            throw new IllegalStateException("Unexpected phone type: " + phoneType);
+        }
+    }
+
 }

diff --git a/src/com/android/phone/DataUsage.java b/src/com/android/phone/DataUsage.java
deleted file mode 100644
index 5ee8d52..0000000
--- a/src/com/android/phone/DataUsage.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2010 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;
-
-import com.android.phone.R;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
-import android.net.Uri;
-import android.net.ThrottleManager;
-import android.util.Log;
-
-
-/**
- * Lists the data usage and throttle settings
- */
-public class DataUsage extends PreferenceActivity {
-
-    private Preference mCurrentUsagePref;
-    private Preference mTimeFramePref;
-    private Preference mThrottleRatePref;
-    private Preference mHelpPref;
-    private String mHelpUri;
-
-    private DataUsageListener mDataUsageListener;
-    private ThrottleManager mThrottleManager;
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        mThrottleManager = (ThrottleManager) getSystemService(Context.THROTTLE_SERVICE);
-
-        addPreferencesFromResource(R.xml.data_usage_settings);
-
-        mCurrentUsagePref = findPreference("throttle_current_usage");
-        mTimeFramePref = findPreference("throttle_time_frame");
-        mThrottleRatePref = findPreference("throttle_rate");
-        mHelpPref = findPreference("throttle_help");
-
-        mHelpUri = mThrottleManager.getHelpUri();
-        if (mHelpUri == null ) {
-            getPreferenceScreen().removePreference(mHelpPref);
-        } else {
-            mHelpPref.setSummary(getString(R.string.throttle_help_subtext));
-        }
-
-        mDataUsageListener = new DataUsageListener(this, mCurrentUsagePref,
-                mTimeFramePref, mThrottleRatePref);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mDataUsageListener.resume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-        mDataUsageListener.pause();
-    }
-
-
-    @Override
-    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-
-        if (preference == mHelpPref) {
-            try {
-                Intent myIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mHelpUri));
-                startActivity(myIntent);
-            } catch (Exception e) {
-                ;
-            }
-        }
-
-        return true;
-    }
-}

diff --git a/src/com/android/phone/DataUsageListener.java b/src/com/android/phone/DataUsageListener.java
deleted file mode 100644
index a72c088..0000000
--- a/src/com/android/phone/DataUsageListener.java
+++ /dev/null

@@ -1,233 +0,0 @@
-/*
- * Copyright (C) 2010 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;
-
-import com.android.phone.R;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceScreen;
-import android.net.Uri;
-import android.net.ThrottleManager;
-import android.util.Log;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.text.DateFormat;
-
-/**
- * Listener for broadcasts from ThrottleManager
- */
-public class DataUsageListener {
-
-    private ThrottleManager mThrottleManager;
-    private Preference mCurrentUsagePref = null;
-    private Preference mTimeFramePref = null;
-    private Preference mThrottleRatePref = null;
-    private Preference mSummaryPref = null;
-    private PreferenceScreen mPrefScreen = null;
-    private boolean mSummaryPrefEnabled = false;
-
-    private final Context mContext;
-    private IntentFilter mFilter;
-    private BroadcastReceiver mReceiver;
-
-    private int mPolicyThrottleValue;  //in kbps
-    private long mPolicyThreshold;
-    private int mCurrentThrottleRate;
-    private long mDataUsed;
-    private Calendar mStart;
-    private Calendar mEnd;
-
-    public DataUsageListener(Context context, Preference summary, PreferenceScreen prefScreen) {
-        mContext = context;
-        mSummaryPref = summary;
-        mPrefScreen = prefScreen;
-        mSummaryPrefEnabled = true;
-        initialize();
-    }
-
-    public DataUsageListener(Context context, Preference currentUsage,
-            Preference timeFrame, Preference throttleRate) {
-        mContext = context;
-        mCurrentUsagePref = currentUsage;
-        mTimeFramePref = timeFrame;
-        mThrottleRatePref = throttleRate;
-        initialize();
-    }
-
-    private void initialize() {
-
-        mThrottleManager = (ThrottleManager) mContext.getSystemService(Context.THROTTLE_SERVICE);
-
-        mStart = GregorianCalendar.getInstance();
-        mEnd = GregorianCalendar.getInstance();
-
-        mFilter = new IntentFilter();
-        mFilter.addAction(ThrottleManager.THROTTLE_POLL_ACTION);
-        mFilter.addAction(ThrottleManager.THROTTLE_ACTION);
-        mFilter.addAction(ThrottleManager.POLICY_CHANGED_ACTION);
-
-        mReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                String action = intent.getAction();
-                if (ThrottleManager.THROTTLE_POLL_ACTION.equals(action)) {
-                    updateUsageStats(intent.getLongExtra(ThrottleManager.EXTRA_CYCLE_READ, 0),
-                        intent.getLongExtra(ThrottleManager.EXTRA_CYCLE_WRITE, 0),
-                        intent.getLongExtra(ThrottleManager.EXTRA_CYCLE_START, 0),
-                        intent.getLongExtra(ThrottleManager.EXTRA_CYCLE_END, 0));
-                } else if (ThrottleManager.POLICY_CHANGED_ACTION.equals(action)) {
-                    updatePolicy();
-                } else if (ThrottleManager.THROTTLE_ACTION.equals(action)) {
-                    updateThrottleRate(intent.getIntExtra(ThrottleManager.EXTRA_THROTTLE_LEVEL, -1));
-                }
-            }
-        };
-    }
-
-    void resume() {
-        mContext.registerReceiver(mReceiver, mFilter);
-        updatePolicy();
-    }
-
-    void pause() {
-        mContext.unregisterReceiver(mReceiver);
-    }
-
-    private void updatePolicy() {
-        /* Fetch values for default interface */
-        mPolicyThrottleValue = mThrottleManager.getCliffLevel(null, 1);
-        mPolicyThreshold = mThrottleManager.getCliffThreshold(null, 1);
-
-        if (mSummaryPref != null) { /* Settings preference */
-            /**
-             * Remove data usage preference in settings
-             * if policy change disables throttling
-             */
-            if (mPolicyThreshold == 0) {
-                if (mSummaryPrefEnabled) {
-                    mPrefScreen.removePreference(mSummaryPref);
-                    mSummaryPrefEnabled = false;
-                }
-            } else {
-                if (!mSummaryPrefEnabled) {
-                    mSummaryPrefEnabled = true;
-                    mPrefScreen.addPreference(mSummaryPref);
-                }
-            }
-        }
-        updateUI();
-    }
-
-    private void updateThrottleRate(int throttleRate) {
-        mCurrentThrottleRate = throttleRate;
-        updateUI();
-    }
-
-    private void updateUsageStats(long readByteCount, long writeByteCount,
-            long startTime, long endTime) {
-        mDataUsed = readByteCount + writeByteCount;
-        mStart.setTimeInMillis(startTime);
-        mEnd.setTimeInMillis(endTime);
-        updateUI();
-    }
-
-    private void updateUI() {
-        if (mPolicyThreshold == 0)
-            return;
-        int dataUsedPercent = (int) ((mDataUsed * 100) / mPolicyThreshold);
-
-        long cycleTime = mEnd.getTimeInMillis() - mStart.getTimeInMillis();
-        long currentTime = GregorianCalendar.getInstance().getTimeInMillis()
-                            - mStart.getTimeInMillis();
-
-        int cycleThroughPercent = (cycleTime == 0) ? 0 : (int) ((currentTime * 100) / cycleTime);
-
-        Calendar cal = Calendar.getInstance();
-        cal.setTimeInMillis(cycleTime - currentTime);
-        int daysLeft = cal.get(Calendar.DAY_OF_YEAR);
-        //cal.get() returns 365 for less than a day
-        if (daysLeft >= 365) daysLeft = 0;
-
-        if (mCurrentUsagePref != null) {
-            /* Update the UI based on whether we are in a throttled state */
-            if (mCurrentThrottleRate > 0) {
-                mCurrentUsagePref.setSummary(mContext.getString(
-                        R.string.throttle_data_rate_reduced_subtext,
-                        toReadable(mPolicyThreshold),
-                        mCurrentThrottleRate));
-            } else {
-                mCurrentUsagePref.setSummary(mContext.getString(
-                        R.string.throttle_data_usage_subtext,
-                        toReadable(mDataUsed), dataUsedPercent, toReadable(mPolicyThreshold)));
-            }
-        }
-        if (mTimeFramePref != null) {
-            mTimeFramePref.setSummary(mContext.getString(R.string.throttle_time_frame_subtext,
-                        cycleThroughPercent, daysLeft,
-                        DateFormat.getDateInstance(DateFormat.SHORT).format(mEnd.getTime())));
-        }
-        if (mThrottleRatePref != null) {
-            mThrottleRatePref.setSummary(mContext.getString(R.string.throttle_rate_subtext,
-                    mPolicyThrottleValue));
-        }
-        if (mSummaryPref != null && mSummaryPrefEnabled) {
-
-            /* Update the UI based on whether we are in a throttled state */
-            if (mCurrentThrottleRate > 0) {
-                mSummaryPref.setSummary(mContext.getString(
-                        R.string.throttle_data_rate_reduced_subtext,
-                        toReadable(mPolicyThreshold),
-                        mCurrentThrottleRate));
-            } else {
-                mSummaryPref.setSummary(mContext.getString(R.string.throttle_status_subtext,
-                            toReadable(mDataUsed),
-                            dataUsedPercent,
-                            toReadable(mPolicyThreshold),
-                            daysLeft,
-                            DateFormat.getDateInstance(DateFormat.SHORT).format(mEnd.getTime())));
-            }
-        }
-    }
-
-    private String toReadable (long data) {
-        long KB = 1024;
-        long MB = 1024 * KB;
-        long GB = 1024 * MB;
-        long TB = 1024 * GB;
-        String ret;
-
-        if (data < KB) {
-            ret = data + " bytes";
-        } else if (data < MB) {
-            ret = (data / KB) + " KB";
-        } else if (data < GB) {
-            ret = (data / MB) + " MB";
-        } else if (data < TB) {
-            ret = (data / GB) + " GB";
-        } else {
-            ret = (data / TB) + " TB";
-        }
-        return ret;
-    }
-}

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index f3d9a14..6900183 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java

@@ -43,6 +43,8 @@
 import android.view.accessibility.AccessibilityManager;
 import android.widget.EditText;
 
+import com.android.phone.common.HapticFeedback;
+
 
 /**
  * EmergencyDialer is a special dialer that is used ONLY for dialing emergency calls.

diff --git a/src/com/android/phone/HapticFeedback.java b/src/com/android/phone/HapticFeedback.java
deleted file mode 100644
index 7001ee0..0000000
--- a/src/com/android/phone/HapticFeedback.java
+++ /dev/null

@@ -1,171 +0,0 @@
-/*
- * Copyright (C) 2009 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;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.SystemVibrator;
-import android.os.Vibrator;
-import android.provider.Settings;
-import android.provider.Settings.System;
-import android.util.Log;
-
-/**
- * Handles the haptic feedback: a light buzz happening when the user
- * presses a soft key (UI button or capacitive key).  The haptic
- * feedback is controlled by:
- * - a system resource for the pattern
- *   The pattern used is tuned per device and stored in an internal
- *   resource (config_virtualKeyVibePattern.)
- * - a system setting HAPTIC_FEEDBACK_ENABLED.
- *   HAPTIC_FEEDBACK_ENABLED can be changed by the user using the
- *   system Settings activity. It must be rechecked each time the
- *   activity comes in the foreground (onResume).
- *
- * This class is not thread safe. It assumes it'll be called from the
- * UI thead.
- *
- * Typical usage:
- * --------------
- *   static private final boolean HAPTIC_ENABLED = true;
- *   private HapticFeedback mHaptic = new HapticFeedback();
- *
- *   protected void onCreate(Bundle icicle) {
- *     mHaptic.init((Context)this, HAPTIC_ENABLED);
- *   }
- *
- *   protected void onResume() {
- *     // Refresh the system setting.
- *     mHaptic.checkSystemSetting();
- *   }
- *
- *   public void foo() {
- *     mHaptic.vibrate();
- *   }
- *
- */
-
-public class HapticFeedback {
-    private static final int VIBRATION_PATTERN_ID =
-            com.android.internal.R.array.config_virtualKeyVibePattern;
-    /** If no pattern was found, vibrate for a small amount of time. */
-    private static final long DURATION = 10;  // millisec.
-    /** Play the haptic pattern only once. */
-    private static final int NO_REPEAT = -1;
-
-    private static final String TAG = "HapticFeedback";
-    private Context mContext;
-    private long[] mHapticPattern;
-    private Vibrator mVibrator;
-
-    private boolean mEnabled;
-    private Settings.System mSystemSettings;
-    private ContentResolver mContentResolver;
-    private boolean mSettingEnabled;
-
-    /**
-     * Initialize this instance using the app and system
-     * configs. Since these don't change, init is typically called
-     * once in 'onCreate'.
-     * checkSettings is not called during init.
-     * @param context To look up the resources and system settings.
-     * @param enabled If false, vibrate will be a no-op regardless of
-     * the system settings.
-     */
-    public void init(Context context, boolean enabled) {
-        mEnabled = enabled;
-        if (enabled) {
-            // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this
-            // vibrator object will be isolated from others.
-            mVibrator = new SystemVibrator();
-            if (!loadHapticSystemPattern(context.getResources())) {
-                mHapticPattern = new long[] {0, DURATION, 2 * DURATION, 3 * DURATION};
-            }
-            mSystemSettings = new Settings.System();
-            mContentResolver = context.getContentResolver();
-        }
-    }
-
-
-    /**
-     * Reload the system settings to check if the user enabled the
-     * haptic feedback.
-     */
-    public void checkSystemSetting() {
-        if (!mEnabled) {
-            return;
-        }
-        try {
-            int val = mSystemSettings.getInt(mContentResolver, System.HAPTIC_FEEDBACK_ENABLED, 0);
-            mSettingEnabled = val != 0;
-        } catch (Resources.NotFoundException nfe) {
-            Log.e(TAG, "Could not retrieve system setting.", nfe);
-            mSettingEnabled = false;
-        }
-
-    }
-
-
-    /**
-     * Generate the haptic feedback vibration. Only one thread can
-     * request it. If the phone is already in a middle of an haptic
-     * feedback sequence, the request is ignored.
-     */
-    public void vibrate() {
-        if (!mEnabled || !mSettingEnabled) {
-            return;
-        }
-        // System-wide configuration may return different styles of haptic feedback pattern.
-        // - an array with one value implies "one-shot vibration"
-        // - an array with multiple values implies "pattern vibration"
-        // We need to switch methods to call depending on the difference.
-        // See also PhoneWindowManager#performHapticFeedbackLw() for another example.
-        if (mHapticPattern != null && mHapticPattern.length == 1) {
-            mVibrator.vibrate(mHapticPattern[0]);
-        } else {
-            mVibrator.vibrate(mHapticPattern, NO_REPEAT);
-        }
-    }
-
-    /**
-     * @return true If the system haptic pattern was found.
-     */
-    private boolean loadHapticSystemPattern(Resources r) {
-        int[] pattern;
-
-        mHapticPattern = null;
-        try {
-            pattern = r.getIntArray(VIBRATION_PATTERN_ID);
-        } catch (Resources.NotFoundException nfe) {
-            Log.e(TAG, "Vibrate pattern missing.", nfe);
-            return false;
-        }
-
-        if (null == pattern || pattern.length == 0) {
-            Log.e(TAG, "Haptic pattern is null or empty.");
-            return false;
-        }
-
-        // int[] to long[] conversion.
-        mHapticPattern = new long[pattern.length];
-        for (int i = 0; i < pattern.length; i++) {
-            mHapticPattern[i] = pattern[i];
-        }
-        return true;
-    }
-}

diff --git a/src/com/android/phone/InCallScreen.java b/src/com/android/phone/InCallScreen.java
index f8ba9c7..c49539b 100755
--- a/src/com/android/phone/InCallScreen.java
+++ b/src/com/android/phone/InCallScreen.java

@@ -3523,17 +3523,6 @@
     }
 
     /**
-     * Answer the ringing call *and* hang up the ongoing call.
-     */
-    private void internalAnswerAndEnd() {
-        if (DBG) log("internalAnswerAndEnd()...");
-        if (VDBG) PhoneUtils.dumpCallManager();
-        // In the rare case when multiple calls are ringing, the UI policy
-        // it to always act on the first ringing call.
-        PhoneUtils.answerAndEndActive(mCM, mCM.getFirstActiveRingingCall());
-    }
-
-    /**
      * Hang up the ringing call (aka "Don't answer").
      */
     /* package */ void hangupRingingCall() {

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index d11ca0e..e4b4de6 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java

@@ -27,7 +27,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.ConnectivityManager;
-import android.net.ThrottleManager;
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Bundle;
@@ -66,7 +65,6 @@
 
     //String keys for preference lookup
     private static final String BUTTON_DATA_ENABLED_KEY = "button_data_enabled_key";
-    private static final String BUTTON_DATA_USAGE_KEY = "button_data_usage_key";
     private static final String BUTTON_PREFERED_NETWORK_MODE = "preferred_network_mode_key";
     private static final String BUTTON_ROAMING_KEY = "button_roaming_key";
     private static final String BUTTON_CDMA_LTE_DATA_SERVICE_KEY = "cdma_lte_data_service_key";
@@ -84,8 +82,6 @@
     private CheckBoxPreference mButtonDataEnabled;
     private Preference mLteDataServicePref;
 
-    private Preference mButtonDataUsage;
-    private DataUsageListener mDataUsageListener;
     private static final String iface = "rmnet0"; //TODO: this will go away
 
     private Phone mPhone;
@@ -219,7 +215,6 @@
         mButtonDataRoam = (CheckBoxPreference) prefSet.findPreference(BUTTON_ROAMING_KEY);
         mButtonPreferredNetworkMode = (ListPreference) prefSet.findPreference(
                 BUTTON_PREFERED_NETWORK_MODE);
-        mButtonDataUsage = prefSet.findPreference(BUTTON_DATA_USAGE_KEY);
         mLteDataServicePref = prefSet.findPreference(BUTTON_CDMA_LTE_DATA_SERVICE_KEY);
 
         boolean isLteOnCdma = mPhone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
@@ -268,9 +263,6 @@
             android.util.Log.d(LOG_TAG, "keep ltePref");
         }
 
-        ThrottleManager tm = (ThrottleManager) getSystemService(Context.THROTTLE_SERVICE);
-        mDataUsageListener = new DataUsageListener(this, mButtonDataUsage, prefSet);
-
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
             // android.R.id.home will be triggered in onOptionsItemSelected()
@@ -299,13 +291,11 @@
             mPhone.getPreferredNetworkType(mHandler.obtainMessage(
                     MyHandler.MESSAGE_GET_PREFERRED_NETWORK_TYPE));
         }
-        mDataUsageListener.resume();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        mDataUsageListener.pause();
     }
 
     /**

diff --git a/src/com/android/phone/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java
index dabffa2..ea8ae38 100644
--- a/src/com/android/phone/OutgoingCallBroadcaster.java
+++ b/src/com/android/phone/OutgoingCallBroadcaster.java

@@ -479,8 +479,8 @@
                 // use the java resolver to find the dialer class (as
                 // opposed to a Context which look up known android
                 // packages only)
-                invokeFrameworkDialer.setClassName("com.android.contacts",
-                                                   "com.android.contacts.DialtactsActivity");
+                invokeFrameworkDialer.setClassName("com.android.dialer",
+                                                   "com.android.dialer.DialtactsActivity");
                 invokeFrameworkDialer.setAction(Intent.ACTION_DIAL);
                 invokeFrameworkDialer.setData(intent.getData());
 

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index acfdd7e..63ef38d 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java

@@ -68,6 +68,7 @@
 import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.cdma.TtyIntent;
+import com.android.phone.common.CallLogAsync;
 import com.android.phone.OtaUtils.CdmaOtaScreenState;
 import com.android.server.sip.SipService;
 
@@ -1757,9 +1758,9 @@
      * while we are now assuming it is "com.android.contacts"
      */
     public static final String EXTRA_CALL_ORIGIN = "com.android.phone.CALL_ORIGIN";
-    private static final String DEFAULT_CALL_ORIGIN_PACKAGE = "com.android.contacts";
+    private static final String DEFAULT_CALL_ORIGIN_PACKAGE = "com.android.dialer";
     private static final String ALLOWED_EXTRA_CALL_ORIGIN =
-            "com.android.contacts.activities.DialtactsActivity";
+            "com.android.dialer.DialtactsActivity";
     /**
      * Used to determine if the preserved call origin is fresh enough.
      */
@@ -1819,7 +1820,7 @@
                     + inCallUiState.latestActiveCallOrigin + ") was found. "
                     + "Go back to the previous screen.");
             // Right now we just launch the Activity which launched in-call UI. Note that we're
-            // assuming the origin is from "com.android.contacts", which may be incorrect in the
+            // assuming the origin is from "com.android.dialer", which may be incorrect in the
             // future.
             final Intent intent = new Intent();
             intent.setClassName(DEFAULT_CALL_ORIGIN_PACKAGE, inCallUiState.latestActiveCallOrigin);

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 441270a..80d7c25 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java

@@ -532,7 +532,7 @@
     }
 
     public boolean isRadioOn() {
-        return mPhone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
+        return mPhone.getServiceState().getVoiceRegState() != ServiceState.STATE_POWER_OFF;
     }
 
     public void toggleRadioOnOff() {
@@ -541,7 +541,7 @@
     }
     public boolean setRadio(boolean turnOn) {
         enforceModifyPermission();
-        if ((mPhone.getServiceState().getState() != ServiceState.STATE_POWER_OFF) != turnOn) {
+        if ((mPhone.getServiceState().getVoiceRegState() != ServiceState.STATE_POWER_OFF) != turnOn) {
             toggleRadioOnOff();
         }
         return true;
@@ -817,10 +817,29 @@
     }
 
     /**
-     * Returns the network type
+     * Returns the data network type
+     *
+     * @Deprecated to be removed Q3 2013 use {@link #getDataNetworkType}.
      */
+    @Override
     public int getNetworkType() {
-        return mPhone.getServiceState().getNetworkType();
+        return mPhone.getServiceState().getDataNetworkType();
+    }
+
+    /**
+     * Returns the data network type
+     */
+    @Override
+    public int getDataNetworkType() {
+        return mPhone.getServiceState().getDataNetworkType();
+    }
+
+    /**
+     * Returns the data network type
+     */
+    @Override
+    public int getVoiceNetworkType() {
+        return mPhone.getServiceState().getVoiceNetworkType();
     }
 
     /**

diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 58a5ba9..274751f 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java

@@ -2531,31 +2531,6 @@
         return sVoipSupported;
     }
 
-    /**
-     * On GSM devices, we never use short tones.
-     * On CDMA devices, it depends upon the settings.
-     */
-    public static boolean useShortDtmfTones(Phone phone, Context context) {
-        int phoneType = phone.getPhoneType();
-        if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
-            return false;
-        } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
-            int toneType = android.provider.Settings.System.getInt(
-                    context.getContentResolver(),
-                    Settings.System.DTMF_TONE_TYPE_WHEN_DIALING,
-                    CallFeaturesSetting.DTMF_TONE_TYPE_NORMAL);
-            if (toneType == CallFeaturesSetting.DTMF_TONE_TYPE_NORMAL) {
-                return true;
-            } else {
-                return false;
-            }
-        } else if (phoneType == PhoneConstants.PHONE_TYPE_SIP) {
-            return false;
-        } else {
-            throw new IllegalStateException("Unexpected phone type: " + phoneType);
-        }
-    }
-
     public static String getPresentationString(Context context, int presentation) {
         String name = context.getString(R.string.unknown);
         if (presentation == PhoneConstants.PRESENTATION_RESTRICTED) {

diff --git a/src/com/android/phone/RespondViaSmsManager.java b/src/com/android/phone/RespondViaSmsManager.java
index 003c56f..be8d23b 100644
--- a/src/com/android/phone/RespondViaSmsManager.java
+++ b/src/com/android/phone/RespondViaSmsManager.java

@@ -132,7 +132,7 @@
         mCannedResponses = loadCannedResponses();
 
         // Build the list: start with the canned responses, but manually add
-        // "Custom message..." as the last choice.
+        // the write-your-own option as the last choice.
         int numPopupItems = mCannedResponses.length + 1;
         String[] popupItems = Arrays.copyOf(mCannedResponses, numPopupItems);
         popupItems[numPopupItems - 1] = mInCallScreen.getResources()

diff --git a/src/com/android/phone/SipBroadcastReceiver.java b/src/com/android/phone/SipBroadcastReceiver.java
index c33c5e1..8fdc7f7 100644
--- a/src/com/android/phone/SipBroadcastReceiver.java
+++ b/src/com/android/phone/SipBroadcastReceiver.java

@@ -31,10 +31,7 @@
 import android.net.sip.SipException;
 import android.net.sip.SipManager;
 import android.net.sip.SipProfile;
-import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
-import android.util.Log;
-
+import android.telephony.Rlog;
 import java.util.List;
 
 /**
@@ -42,6 +39,7 @@
  */
 public class SipBroadcastReceiver extends BroadcastReceiver {
     private static final String TAG = SipBroadcastReceiver.class.getSimpleName();
+    private static final boolean DBG = true;
     private SipSharedPreferences mSipSharedPreferences;
 
     @Override
@@ -49,7 +47,7 @@
         String action = intent.getAction();
 
         if (!PhoneUtils.isVoipSupported()) {
-            Log.v(TAG, "SIP VOIP not supported: " + action);
+            if (DBG) log("SIP VOIP not supported: " + action);
             return;
         }
         mSipSharedPreferences = new SipSharedPreferences(context);
@@ -62,18 +60,18 @@
             if (phone != null) {
                 CallManager.getInstance().registerPhone(phone);
             }
-            Log.d(TAG, "new phone: " + localSipUri + " #phones="
+            if (DBG) log("onReceive: add phone" + localSipUri + " #phones="
                     + CallManager.getInstance().getAllPhones().size());
         } else if (action.equals(SipManager.ACTION_SIP_REMOVE_PHONE)) {
             String localSipUri = intent.getStringExtra(SipManager.EXTRA_LOCAL_URI);
             removeSipPhone(localSipUri);
-            Log.d(TAG, "removed phone: " + localSipUri + " #phones="
+            if (DBG) log("onReceive: remove phone: " + localSipUri + " #phones="
                     + CallManager.getInstance().getAllPhones().size());
         } else if (action.equals(SipManager.ACTION_SIP_SERVICE_UP)) {
-            Log.v(TAG, "start auto registration");
+            if (DBG) log("onReceive: start auto registration");
             registerAllProfiles();
         } else {
-            Log.v(TAG, "action not processed: " + action);
+            if (DBG) log("onReceive: action not processed: " + action);
             return;
         }
     }
@@ -82,12 +80,12 @@
         for (Phone phone : CallManager.getInstance().getAllPhones()) {
             if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP) {
                 if (((SipPhone) phone).getSipUri().equals(sipUri)) {
-                    CallManager.getInstance().unregisterPhone((SipPhone)phone);
+                    CallManager.getInstance().unregisterPhone(phone);
                     return;
                 }
             }
         }
-        Log.v(TAG, "Remove phone failed:cannot find phone with uri " + sipUri);
+        if (DBG) log("RemoveSipPhone: failed:cannot find phone with uri " + sipUri);
     }
 
     private void takeCall(Intent intent) {
@@ -97,18 +95,22 @@
                     .takeAudioCall(intent, null);
             for (Phone phone : CallManager.getInstance().getAllPhones()) {
                 if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP) {
-                   if (((SipPhone) phone).canTake(sipAudioCall)) return;
+                   if (((SipPhone) phone).canTake(sipAudioCall)) {
+                       if (DBG) log("takeCall: SIP call: " + intent);
+                       return;
+                   }
                 }
             }
-            Log.v(TAG, "drop SIP call: " + intent);
+            if (DBG) log("takeCall: not taken, drop SIP call: " + intent);
         } catch (SipException e) {
-            Log.e(TAG, "process incoming SIP call", e);
+            loge("takeCall: error incoming SIP call", e);
         }
     }
 
     private void registerAllProfiles() {
         final Context context = PhoneGlobals.getInstance();
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 SipManager sipManager = SipManager.newInstance(context);
                 SipProfileDb profileDb = new SipProfileDb(context);
@@ -124,11 +126,20 @@
                         sipManager.open(profile,
                                 SipUtil.createIncomingCallPendingIntent(),
                                 null);
+                        if (DBG) log("registerAllProfiles: profile=" + profile);
                     } catch (SipException e) {
-                        Log.e(TAG, "failed" + profile.getProfileName(), e);
+                        loge("registerAllProfiles: failed" + profile.getProfileName(), e);
                     }
                 }
             }}
         ).start();
     }
+
+    private void log(String s) {
+        Rlog.d(TAG, s);
+    }
+
+    private void loge(String s, Throwable t) {
+        Rlog.e(TAG, s, t);
+    }
 }
commit	076ace4f1a1c26eb297c0ffa8461a8d5aec766d6	[log] [tgz]
author	Wink Saville <wink@google.com>	Wed Jan 23 17:42:47 2013 -0800
committer	Android Git Automerger <android-git-automerger@android.com>	Wed Jan 23 17:42:47 2013 -0800
tree	e27136c94b68fda8b09955cdaab29165abbff56c
parent	7db28f9bd77c74ae8f2ddbaf9fe7c768144350af [diff]
parent	19d142349f0b418724afd33a89c0265328741c89 [diff]