diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 654790d..7d253c4 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Kies outomaties"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Kies voorkeurnetwerk outomaties"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Outomatiese registrasie..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Voorkeurnetwerktipe"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Netwerkmodus"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Verander die netwerkbedryfsmodus"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Voorkeurnetwerktipe"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Voorkeurnetwerk-modus"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Voorkeurnetwerk-modus: WCDMA verkies"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Voorkeurnetwerk-modus: net GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Voorkeurnetwerk-modus: net WCDMA"</string>
@@ -279,9 +279,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multikategorie"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multikategorie geaktiveer"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multikategorie gedeaktiveer"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (aanbeveel)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (aanbeveel)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globaal"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Stelselkeuse"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Verander die CDMA-swerfmodus"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Stelselkeuse"</string>
@@ -302,7 +299,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktiveer toestel"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Stel datadiens op"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Diensverskaffer-instellings"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Belbeperking-nommers"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-lys"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-aktivering"</string>
@@ -341,7 +339,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN is nie opgedateer nie omdat jy \'n verkeerde PIN ingevoer het."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN is nie opgedateer nie, omdat die getal nie 20 syfers kan oorskry nie."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN is nie bygewerk nie. Die PIN2 was verkeerd of die foonnommer is verwerp."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN-bewerking het misluk."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lees tans van SIM-kaart af…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Geen kontakte op jou SIM-kaart nie."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Kies kontakte om in te voer"</string>
@@ -362,7 +359,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM-PIN gedeaktiveer."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Die PIN wat jy ingevoer het, is verkeerd."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM-PIN suksesvol verander."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Wagwoord verkeerd, PIN geblokkeer! PUK word versoek."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Wagwoord verkeerd, SIM is gesluit! PUK2 versoek."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Ou PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nuwe PIN2"</string>
@@ -374,11 +371,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Sleutel \'n 8-nommer-PUK2 in."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 suksesvol verander"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Sleutel PUK2-kode in"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Wagwoord verkeerd, PIN2 geblokkeer. Verander asseblief PIN2 en probeer weer!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Wagwoord verkeerd. Verander PIN2 en probeer weer!"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Wagwoord verkeerd, SIM is gesluit. PUK2 word versoek."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanent geblokkeer."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Daar is <xliff:g id="NUMBER">%d</xliff:g> oorblywende pogings."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 gedeblokkeer!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Klaar"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferensie-oproep <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Stemboodskapnommer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f12ceef..8a0a825 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"በራስ ሰር ምረጥ"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"ተመራጭ አውታረ መረብን በራስ ሰር ምረጥ"</string>
     <string name="register_automatically" msgid="6017849844573519637">"ራስ ሰር ምዝገባ...."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"የሚመረጠው የአውታረ መረብ አይነት"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"የአውታረ መረብ ሁነታ"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"የአውታረመረቡንመከወኛ ሁነታ ለውጥ"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"የሚመረጠው የአውታረ መረብ አይነት"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"ተመራጭ  የአውታረ መረብ ሁነታ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"ተመራጭ የአውታረመረብ ፡WCDMA ሁነታ ተመራጭ"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"ተመራጭ የአውታረመረብ ፡GSM ሁነታ ብቻ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"ተመራጭ የአውታረመረብ ፡WCDMA ሁነታ ብቻ"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"ብዙ ምድብ"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"ብዙ ምድብ ነቅቷል"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"ብዙ-ምድብ አልነቃም"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (የሚመከር)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (የሚመከር)"</string>
-    <string name="network_global" msgid="1323190488685355309">"አለምአቀፍ"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"የሥርዓት ምርጫ"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"የCDMA በእንቅስቃሴ ላይ ሁኔታ ለውጥ"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"የሥርዓት ምርጫ"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"መሣሪያ አግብር"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"የውሂብ አግልግሎት አዋቅር"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"የድምጸ ተያያዥ ሞደም ቅንብሮች"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"በቋሚነት የሚደወልባቸው  ቁጥሮች"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ዝርዝር"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"የFDN አግብር"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"የተሳሳተ ፒን ስላስገባህ FDN አልዘመነም፡፡"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"ቁጥሩ ከ20 አሀዞች በላይ መብለጥ ስለማይችል FDN አልዘመነም፡፡"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN አልዘመነም። ፒን2 ትክክል አልነበረም፣ ወይም የስልክ ቁጥሩ ተቀባይነት አላገኘም።"</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN ክወና አልተሳካም!"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"ከSIM ካርድ ላይ በማንበብ ላይ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"በ SIM ካርድዎ ላይ ዕውቂያዎች የሉም።"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"ለማስገባት ዕውቂያዎች ምረጥ"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM ፒን  ቦዝኗል"</string>
     <string name="pin_failed" msgid="2298841192582192277">"የተየብከው PIN የተሳሳተ ነበር።"</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM PIN በተሳካ ተለውጧል"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"የይለፍ ቃሉ የተሳሳተ ነው፣ ን ታግዷል! PUK ያስፈልጋል።"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"የተሳሳተይለፍ ቃል፣SIM ተቆልፏል! PUK2 ይጠየቃል።"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"የድሮ PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"አዲስPIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"8 ቁጥሮች የሆኑ PUK2  ተይብ።"</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 በተሳካ ተለውጧል"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"የPUK2 ኮድ ተይብ"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"የይለፍ ቃል ትክክል አይደለም፣ ፒን2 ታግዷል። እባክዎ ፒን2ን ይቀይሩ እና እንደገና ይሞክሩ።"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"የተሳሳተ የይለፍ ቃል፣ ፒን2 ለውጥ እና ድጋሚ ሞክር!"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"የተሳሳተ ይለፍ ቃል፣ SIM ተቆልፏል! PUK2 ይጠየቃል።"</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"ፒን2 በቋሚነት ታግዷል።"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n" <xliff:g id="NUMBER">%d</xliff:g> ቀሪ ሙከራዎች አሉ።"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"ፒን2 እገዳው ተነስቷል!"</string>
     <string name="doneButton" msgid="2859593360997984240">"ተከናውኗል"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"የስብሰባ ጥሪ<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"የድምፅ መልዕክት ቁጥር"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ad9bd0d..a479b61 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -20,16 +20,16 @@
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"الهاتف"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"طالب الطوارئ"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"الهاتف"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"‏قائمة FDN"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"قائمة FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"غير معروف"</string>
     <string name="private_num" msgid="6713286113000232309">"رقم خاص"</string>
     <string name="payphone" msgid="1931775086311769314">"هاتف الدفع"</string>
     <string name="onHold" msgid="9035493194749959955">"معلقة"</string>
-    <string name="mmiStarted" msgid="6347869857061147003">"‏بدأ رمز MMI"</string>
-    <string name="ussdRunning" msgid="485588686340541690">"‏جارٍ تشغيل رمز USSD..."</string>
-    <string name="mmiCancelled" msgid="2771923949751842276">"‏تم إلغاء كود MMI"</string>
+    <string name="mmiStarted" msgid="6347869857061147003">"بدأ رمز MMI"</string>
+    <string name="ussdRunning" msgid="485588686340541690">"جارٍ تشغيل رمز USSD..."</string>
+    <string name="mmiCancelled" msgid="2771923949751842276">"تم إلغاء كود MMI"</string>
     <string name="cancel" msgid="5044513931633602634">"إلغاء"</string>
-    <string name="enter_input" msgid="1810529547726803893">"‏يجب أن تتراوح حروف رسالة USSD بين <xliff:g id="MIN_LEN">%d</xliff:g> و<xliff:g id="MAX_LEN">%d</xliff:g>. الرجاء إعادة المحاولة."</string>
+    <string name="enter_input" msgid="1810529547726803893">"يجب أن تتراوح حروف رسالة USSD بين <xliff:g id="MIN_LEN">%d</xliff:g> و<xliff:g id="MAX_LEN">%d</xliff:g>. الرجاء إعادة المحاولة."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"إدارة مكالمة جماعية"</string>
     <string name="ok" msgid="3811371167865772377">"موافق"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"السماعة"</string>
@@ -43,17 +43,17 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"لا"</string>
     <string name="wild_prompt_str" msgid="5543521676355533577">"استبدال حرف البدل بـ"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"رقم البريد الصوتي مفقود"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"‏لم يتم تخزين رقم بريد صوتي على بطاقة SIM."</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"لم يتم تخزين رقم بريد صوتي على بطاقة SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"إضافة رقم"</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"‏تم إلغاء حظر بطاقة SIM. جارٍ إلغاء تأمين الهاتف..."</string>
-    <string name="label_ndp" msgid="780479633159517250">"‏رمز PIN لإلغاء تأمين شبكة SIM"</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"تم إلغاء حظر بطاقة SIM. جارٍ إلغاء تأمين الهاتف..."</string>
+    <string name="label_ndp" msgid="780479633159517250">"رقم التعريف الشخصي لإلغاء تأمين شبكة SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"إلغاء تأمين"</string>
     <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"استبعاد"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"جارٍ طلب إلغاء تأمين الشبكة..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"لم ينجح طلب إلغاء تأمين الشبكة."</string>
     <string name="unlock_success" msgid="6770085622238180152">"نجح إلغاء تأمين الشبكة."</string>
-    <string name="labelGSMMore" msgid="5930842194056092106">"‏إعدادات اتصال نظام GSM"</string>
-    <string name="labelCDMAMore" msgid="1630676740428229339">"‏إعدادات اتصال CDMA"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"إعدادات اتصال نظام GSM"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"إعدادات اتصال CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"الدخول إلى أسماء النقاط"</string>
     <string name="settings_label" msgid="3876743539816984008">"إعدادات الشبكة"</string>
     <string name="voicemail" msgid="8693759337917898954">"البريد الصوتي"</string>
@@ -61,9 +61,9 @@
     <string name="networks" msgid="8873030692174541976">"مشغلو الشبكة"</string>
     <string name="call_settings" msgid="6112441768261754562">"إعدادات الاتصال"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"إعدادات إضافية"</string>
-    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"‏إعدادات اتصال GSM الإضافية فقط"</string>
-    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"‏إعدادات اتصال CDMA الإضافية"</string>
-    <string name="sum_cdma_call_settings" msgid="284753265979035549">"‏إعدادات اتصال CDMA الإضافية فقط"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"إعدادات اتصال GSM الإضافية فقط"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"إعدادات اتصال CDMA الإضافية"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"إعدادات اتصال CDMA الإضافية فقط"</string>
     <string name="labelNwService" msgid="4699970172021870983">"إعدادات خدمة الشبكة"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"معرف المتصل"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"جارٍ تحميل الإعدادات…"</string>
@@ -73,8 +73,8 @@
     <string name="labelCW" msgid="6120513814915920200">"انتظار المكالمة"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"تنبيهي بالمكالمات الواردة أثناء المكالمة"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"تنبيهي بالمكالمات الواردة أثناء المكالمة"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"إعدادات اعادة توجيه المكالمة"</string>
-    <string name="labelCF" msgid="2574386948026924737">"اعادة توجيه المكالمة"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"إعدادات إعادة توجيه الاتصال"</string>
+    <string name="labelCF" msgid="2574386948026924737">"إعادة توجيه الاتصال"</string>
     <string name="labelCFU" msgid="8147177368148660600">"إعادة التوجيه دومًا"</string>
     <string name="messageCFU" msgid="3560082430662923687">"استخدام هذا الرقم دائمًا"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"إعادة التوجيه كل المكالمات"</string>
@@ -85,24 +85,24 @@
     <string name="messageCFB" msgid="3711089705936187129">"الرقم عندما يكون مشغولاً"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"إعادة التوجيه إلى <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"معطّل"</string>
-    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"لا يتيح مشغل شبكة الجوال تعطيل اعادة توجيه المكالمة عندما يكون هاتفك مشغولاً."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عندما يكون هاتفك مشغولاً."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"إعادة التوجيه عند عدم الرد"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"الرقم عندما لا يتم الرد"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"إعادة التوجيه إلى <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"معطّل"</string>
-    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"لا يتيح مشغل شبكة الجوال تعطيل اعادة توجيه المكالمة عند عدم رد هاتفك."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عند عدم رد هاتفك."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"إعادة التوجيه عندما لا يمكن الوصول"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"الرقم عندما لا يمكن الوصول"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"إعادة التوجيه إلى <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"معطّل"</string>
-    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"لا يتيح مشغل شبكة الجوال تعطيل اعادة توجيه المكالمة عند عدم التمكن من الوصول إلى هاتفك."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عند عدم التمكن من الوصول إلى هاتفك."</string>
     <string name="updating_title" msgid="6146755386174019046">"إعدادات الاتصال"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"خطأ في إعدادات الاتصال"</string>
     <string name="reading_settings" msgid="1920291699287055284">"جارٍ قراءة الإعدادات..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"جارٍ تحديث الإعدادات..."</string>
     <string name="reverting_settings" msgid="4752151682666912828">"جارٍ إعادة الإعدادات..."</string>
     <string name="response_error" msgid="6674110501330139405">"رد غير متوقع من الشبكة."</string>
-    <string name="exception_error" msgid="7027667130619518211">"‏خطأ في الشبكة أو في بطاقة SIM"</string>
+    <string name="exception_error" msgid="7027667130619518211">"خطأ في الشبكة أو في بطاقة SIM"</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"تم تشغيل إعداد أرقام الاتصال الثابتة بالتطبيق المثبت على هاتفك. ونتيجة لذلك، لن تعمل بعض الميزات المرتبطة بالمكالمات."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"شغّل اللاسلكي قبل عرض هذه الإعدادات."</string>
     <string name="close_dialog" msgid="2365884406356986917">"موافق"</string>
@@ -128,7 +128,7 @@
     <string name="search_networks" msgid="1601136049300882441">"بحث في الشبكات"</string>
     <string name="network_query_error" msgid="6828516148953325006">"حدث خطأ أثناء البحث عن شبكات."</string>
     <string name="register_on_network" msgid="9055203954040805084">"جارٍ التسجيل على <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="5613353860205691579">"‏لا تسمح بطاقة SIM بالاتصال بهذه الشبكة."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"لا تسمح بطاقة SIM بالاتصال بهذه الشبكة."</string>
     <string name="connect_later" msgid="2308119155752343975">"يتعذر الاتصال بهذه الشبكة في الوقت الحالي. حاول مرة أخرى لاحقًا."</string>
     <string name="registration_done" msgid="495135664535876612">"مسجل على الشبكة."</string>
     <string name="sum_carrier_select" msgid="3494252551249882718">"اختر مشغل شبكة جوال"</string>
@@ -136,23 +136,23 @@
     <string name="select_automatically" msgid="5628402124471810174">"اختيار تلقائي"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"اختيار الشبكة المفضلة تلقائيًا"</string>
     <string name="register_automatically" msgid="6017849844573519637">"التسجيل التلقائي..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"نوع الشبكة المفضل"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"وضع الشبكة"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"تغيير وضع تشغيل الشبكة"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"نوع الشبكة المفضل"</string>
-    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"‏وضع الشبكة المفضل: تم تفضيل WCDMA"</string>
-    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"‏وضع الشبكة المفضل: GSM فقط"</string>
-    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"‏وضع الشبكة المفضل: WCDMA فقط"</string>
-    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"‏وضع الشبكة المفضل: GSM / WCDMA"</string>
-    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"‏وضع الشبكة المفضل: CDMA"</string>
-    <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_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_dialogtitle" msgid="8176355237105593793">"وضع الشبكة المفضل"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"وضع الشبكة المفضل: تم تفضيل WCDMA"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"وضع الشبكة المفضل: GSM فقط"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"وضع الشبكة المفضل: WCDMA فقط"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"وضع الشبكة المفضل: GSM / WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"وضع الشبكة المفضل: CDMA"</string>
+    <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_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 name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"وضع الشبكة المفضل: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -160,13 +160,13 @@
     <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="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>
+    <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>
@@ -175,8 +175,8 @@
     <string name="roaming_disable" msgid="1843417228755568110">"اتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تشغيل تجوال البيانات بشبكتك الرئيسية."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"هل تريد السماح بتجوال البيانات؟ قد يكلفك ذلك رسوم تجوال مرتفعة!"</string>
-    <string name="gsm_umts_options" msgid="6538311689850981686">"‏خيارات نظام GSM/النظام العالمي لاتصالات الجوال عن بعد (UMTS)"</string>
-    <string name="cdma_options" msgid="4016822858172249884">"‏خيارات CDMA"</string>
+    <string name="gsm_umts_options" msgid="6538311689850981686">"خيارات نظام GSM/النظام العالمي لاتصالات الجوال عن بعد (UMTS)"</string>
+    <string name="cdma_options" msgid="4016822858172249884">"خيارات CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"استخدام البيانات"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"البيانات المستخدمة في المدة الحالية"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"مدة استخدام البيانات"</string>
@@ -188,11 +188,11 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"انقضت نسبة <xliff:g id="USED_0">%1$d</xliff:g>٪ من الدورة\nتبدأ الفترة التالية خلال <xliff:g id="USED_1">%2$d</xliff:g> يوم (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"تخفيض معدل البيانات إلى <xliff:g id="USED">%1$d</xliff:g> كيلوبايت/ثانية إذا تم تعدي حد البيانات"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"مزيد من المعلومات حول سياسة استخدام بيانات شبكة جوال مشغل شبكة الجوال"</string>
-    <string name="cell_broadcast_sms" msgid="5584192824053625842">"‏الرسائل القصيرة SMS لبث الخلية"</string>
-    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"‏الرسائل القصيرة SMS لبث الخلية"</string>
-    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"‏تم تمكين الرسائل القصيرة SMS لبث الخلية"</string>
-    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"‏تم تعطيل الرسائل القصيرة SMS لبث الخلية"</string>
-    <string name="cb_sms_settings" msgid="651715019785107312">"‏إعدادات الرسائل القصيرة SMS لبث الخلية"</string>
+    <string name="cell_broadcast_sms" msgid="5584192824053625842">"الرسائل القصيرة SMS لبث الخلية"</string>
+    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"الرسائل القصيرة SMS لبث الخلية"</string>
+    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"تم تمكين الرسائل القصيرة SMS لبث الخلية"</string>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"تم تعطيل الرسائل القصيرة SMS لبث الخلية"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"إعدادات الرسائل القصيرة SMS لبث الخلية"</string>
     <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"بث الطوارئ"</string>
     <string name="emergency_broadcast_enable" msgid="2645980025414010211">"تم تمكين بث الطوارئ"</string>
     <string name="emergency_broadcast_disable" msgid="3665199821267569426">"تم تعطيل بث الطوارئ"</string>
@@ -275,21 +275,18 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"متعددة الفئات"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"تم تمكين المتعددة الفئات"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"تم تعطيل متعددة الفئات"</string>
-    <string name="network_lte" msgid="7702681952521375754">"‏LTE (مستحسن)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"الجيل الرابع (مستحسن)"</string>
-    <string name="network_global" msgid="1323190488685355309">"عام"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"تحديد النظام"</string>
-    <string name="cdma_system_select_summary" msgid="60460043745797517">"‏تغيير وضع التجوال عبر CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"تغيير وضع التجوال عبر CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"تحديد النظام"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"الرئيسية فقط"</item>
     <item msgid="1205664026446156265">"تلقائي"</item>
   </string-array>
-    <string name="cdma_subscription_title" msgid="1162564010076763284">"‏اشتراك CDMA"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"‏تغيير بين RUIM/SIM وNV"</string>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"اشتراك CDMA"</string>
+    <string name="cdma_subscription_summary" msgid="2530890766115781140">"تغيير بين RUIM/SIM وNV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"الاشتراك"</string>
   <string-array name="cdma_subscription_choices">
-    <item msgid="2258014151300708431">"‏بطاقة RUIM/SIM"</item>
+    <item msgid="2258014151300708431">"بطاقة RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
   </string-array>
   <string-array name="cdma_subscription_values">
@@ -298,30 +295,31 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"تنشيط الجهاز"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"إعداد خدمة البيانات"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"إعدادات مشغل شبكة الجوّال"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"أرقام الاتصال الثابتة"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"‏قائمة FDN"</string>
-    <string name="fdn_activation" msgid="2156479741307463576">"‏تنشيط FDN"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"قائمة FDN"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"تنشيط FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"تم تمكين أرقام الاتصال الثابتة"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"تم تعطيل أرقام الاتصال الثابتة"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"‏تمكين FDN"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"‏تعطيل FDN"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"‏تغيير رمز PIN PIN2"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"‏تعطيل FDN"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"‏تمكين FDN"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"تمكين FDN"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"تعطيل FDN"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"تغيير رقم التعريف الشخصي PIN2"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"تعطيل FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"تمكين FDN"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"إدارة أرقام الاتصال الثابتة"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"‏تغيير رمز PIN للدخول إلى FDN"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"تغيير رقم التعريف الشخصي للدخول إلى FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"إدارة قائمة أرقام الهاتف"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"خصوصية الصوت"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"تمكين وضع الخصوصية المحسن"</string>
-    <string name="tty_mode_option_title" msgid="9033098925144434669">"‏وضع TTY"</string>
-    <string name="tty_mode_option_summary" msgid="1073835131534808732">"‏تعيين وضع TTY"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"وضع TTY"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"تعيين وضع TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"إعادة المحاولة تلقائيًا"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"تمكين وضع إعادة المحاولة التلقائي"</string>
     <string name="menu_add" msgid="1882023737425114762">"إضافة جهة اتصال"</string>
     <string name="menu_edit" msgid="7143003705504672374">"تعديل جهة الاتصال"</string>
     <string name="menu_delete" msgid="3977150783449642851">"حذف جهة الاتصال"</string>
-    <string name="get_pin2" msgid="8204677063922225311">"‏اكتب رقم تعريف شخصي PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"اكتب رقم تعريف شخصي PIN2"</string>
     <string name="name" msgid="7329028332786872378">"الاسم"</string>
     <string name="number" msgid="7905950798349903858">"الرقم"</string>
     <string name="save" msgid="4094274636321939086">"حفظ"</string>
@@ -334,47 +332,43 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"حذف رقم الاتصال الثابت"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"جارٍ حذف رقم الاتصال الثابت..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"تم حذف رقم الاتصال الثابت."</string>
-    <string name="pin2_invalid" msgid="5470854099230755944">"‏لم يتم تحديث FDN لأنك كتبت رقم تعريف شخصي غير صحيح."</string>
-    <string name="fdn_invalid_number" msgid="1494755047900009147">"‏لم يتم تحديث FDN لأن العدد لا يمكن أن يتجاوز 20 رقمًا."</string>
-    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"‏لم يتم تحديث FDN. رقم PIN2 غير صحيح، أو تم رفض رقم الهاتف."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"‏أخفقت عملية FDN!"</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"‏جارٍ القراءة من بطاقة SIM..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"‏ليس هناك جهات اتصال على بطاقة SIM."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"لم يتم تحديث FDN لأنك كتبت رقم تعريف شخصي غير صحيح."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"لم يتم تحديث FDN لأن العدد لا يمكن أن يتجاوز 20 رقمًا."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"لم يتم تحديث FDN. رقم PIN2 غير صحيح، أو تم رفض رقم الهاتف."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"جارٍ القراءة من بطاقة SIM..."</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"ليس هناك جهات اتصال على بطاقة SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"حدد جهات اتصال لاستيرادها"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"‏لاستيراد جهات اتصال من بطاقة SIM، الرجاء إيقاف وضع الطائرة أولاً."</string>
-    <string name="enable_pin" msgid="5422767284133234860">"‏تمكين/تعطيل رمز PIN لبطاقة SIM"</string>
-    <string name="change_pin" msgid="9174186126330785343">"‏تغيير رمز PIN لبطاقة SIM"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"‏رمز PIN لبطاقة SIM:"</string>
-    <string name="oldPinLabel" msgid="5287773661246368314">"‏رمز PIN القديم"</string>
-    <string name="newPinLabel" msgid="207488227285336897">"‏رمز PIN الجديد"</string>
-    <string name="confirmPinLabel" msgid="257597715098070206">"‏تأكيد رمز PIN الجديد"</string>
-    <string name="badPin" msgid="8955102849303984935">"‏رمز PIN القديم الذي كتبته غير صحيح. حاول مرة أخرى."</string>
-    <string name="mismatchPin" msgid="5923253370683071889">"‏أرقام التعريف الشخصي PIN2 التي كتبتها غير متطابقة. حاول مرة أخرى."</string>
-    <string name="invalidPin" msgid="5981171102258684792">"‏اكتب رمز PIN المكون من 4 إلى 8 أرقام."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"‏تعطيل رمز PIN لبطاقة SIM"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"‏تمكين رمز PIN لبطاقة SIM"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"لاستيراد جهات اتصال من بطاقة SIM، الرجاء إيقاف وضع الطائرة أولاً."</string>
+    <string name="enable_pin" msgid="5422767284133234860">"تمكين/تعطيل رقم التعريف الشخصي لبطاقة SIM"</string>
+    <string name="change_pin" msgid="9174186126330785343">"تغيير رقم التعريف الشخصي لبطاقة SIM"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"رقم التعريف الشخصي لبطاقة SIM:"</string>
+    <string name="oldPinLabel" msgid="5287773661246368314">"رقم التعريف الشخصي القديم"</string>
+    <string name="newPinLabel" msgid="207488227285336897">"رقم التعريف الشخصي الجديد"</string>
+    <string name="confirmPinLabel" msgid="257597715098070206">"تأكيد رقم التعريف الشخصي الجديد"</string>
+    <string name="badPin" msgid="8955102849303984935">"رقم التعريف الشخصي القديم الذي كتبته غير صحيح. حاول مرة أخرى."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"أرقام التعريف الشخصي PIN2 التي كتبتها غير متطابقة. حاول مرة أخرى."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"اكتب رقم التعريف الشخصي المكون من 4 إلى 8 أرقام."</string>
+    <string name="disable_sim_pin" msgid="3992926931620188855">"تعطيل رقم التعريف الشخصي لبطاقة SIM"</string>
+    <string name="enable_sim_pin" msgid="5803702443844458831">"تمكين رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"يُرجى الانتظار…"</string>
-    <string name="enable_pin_ok" msgid="9166061915030865848">"‏تم تمكين رمز PIN لبطاقة SIM."</string>
-    <string name="disable_pin_ok" msgid="5596999379593924850">"‏تم تعطيل رمز PIN لبطاقة SIM."</string>
-    <string name="pin_failed" msgid="2298841192582192277">"‏رمز PIN الذي كتبته ليس صحيحًا."</string>
-    <string name="pin_changed" msgid="4365538014588501049">"‏تم تغيير رمز PIN لبطاقة SIM بنجاح."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"‏كلمة المرور غير صحيحة، تم حظر رقم التعريف الشخصي! يُرجى إدخال رمز PUK."</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"تم تمكين رقم التعريف الشخصي لبطاقة SIM."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"تم تعطيل رقم التعريف الشخصي لبطاقة SIM."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"رقم التعريف الشخصي الذي كتبته ليس صحيحًا."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"تم تغيير رقم التعريف الشخصي لبطاقة SIM بنجاح."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"كلمة المرور غير صحيحة، تم تأمين بطاقة SIM! رقم PUK2 مطلوب."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"‏رمز PIN PIN2 القديم"</string>
-    <string name="newPin2Label" msgid="4573956902204349054">"‏رقم تعريف شخصي PIN2 جديد"</string>
-    <string name="confirmPin2Label" msgid="8100319484454787708">"‏تأكيد رمز PIN PIN2 الجديد"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"‏رقم PUK2 الذي كتبته غير صحيح. حاول مرة أخرى."</string>
-    <string name="badPin2" msgid="1041576234483629991">"‏رمز PIN PIN2 القديم الذي كتبته غير صحيح. الرجاء المحاولة مرة أخرى."</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"‏أرقام التعريف الشخصي PIN2 التي كتبتها غير متطابقة. حاول مرة أخرى."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"‏اكتب رمز PIN PIN2 المكون من 4 إلى 8 أرقام."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"‏اكتب PUK2 يتكون من 8 أحرف."</string>
-    <string name="pin2_changed" msgid="1639666438836544393">"‏تم تغيير رمز PIN PIN2 بنجاح."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"‏اكتب رمز PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"‏كلمة المرور غير صحيحة، تم حظر PIN2. الرجاء تغيير رمز PIN2 وإعادة المحاولة!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"‏كلمة المرور غير صحيحة، تم تأمين بطاقة SIM. رقم PUK2 مطلوب."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"‏تم حظر PUK2 بشكل دائم."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"يتبقى لديك <xliff:g id="NUMBER">%d</xliff:g> من المحاولات."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"‏تمت إزالة حظر PIN2!"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"رقم التعريف الشخصي PIN2 القديم"</string>
+    <string name="newPin2Label" msgid="4573956902204349054">"رقم تعريف شخصي PIN2 جديد"</string>
+    <string name="confirmPin2Label" msgid="8100319484454787708">"تأكيد رقم التعريف الشخصي PIN2 الجديد"</string>
+    <string name="badPuk2" msgid="4851734468010000418">"رقم PUK2 الذي كتبته غير صحيح. حاول مرة أخرى."</string>
+    <string name="badPin2" msgid="1041576234483629991">"رقم التعريف الشخصي PIN2 القديم الذي كتبته غير صحيح. الرجاء المحاولة مرة أخرى."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"أرقام التعريف الشخصي PIN2 التي كتبتها غير متطابقة. حاول مرة أخرى."</string>
+    <string name="invalidPin2" msgid="8237110107480395938">"اكتب رقم التعريف الشخصي PIN2 المكون من 4 إلى 8 أرقام."</string>
+    <string name="invalidPuk2" msgid="1290977391033057871">"اكتب PUK2 يتكون من 8 أحرف."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"تم تغيير رقم التعريف الشخصي PIN2 بنجاح."</string>
+    <string name="label_puk2_code" msgid="302845876240219560">"اكتب رمز PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"كلمة المرور غير صحيحة.غيّر رقم التعريف الشخصي PIN2 وأعد المحاولة."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"كلمة المرور غير صحيحة، تم تأمين بطاقة SIM. رقم PUK2 مطلوب."</string>
     <string name="doneButton" msgid="2859593360997984240">"تم"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"مكالمة جماعية <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"رقم البريد الصوتي"</string>
@@ -409,7 +403,7 @@
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"شبكة الجوال غير متاحة."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"لم يتم إرسال الاتصال، لم يتم إدخال رقم صالح."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"لم يتم إرسال الاتصال."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"‏جارٍ بدء تسلسل MMI..."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"جارٍ بدء تسلسل MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"خدمة غير معتمدة."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"يتعذر تبديل المكالمات."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"يتعذر فصل المكالمة."</string>
@@ -437,18 +431,18 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"مكالمة فيديو"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"استيراد"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"استيراد الكل"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"‏استيراد جهات اتصال بطاقة SIM"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"استيراد جهات اتصال بطاقة SIM"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"استيراد من جهات الاتصال"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"أدوات السمع المساعدة"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"تشغيل التوافق مع أداة السمع"</string>
   <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"‏إيقاف تشغيل TTY"</item>
-    <item msgid="3971695875449640648">"‏TTY مكتمل"</item>
+    <item msgid="512950011423868021">"إيقاف تشغيل TTY"</item>
+    <item msgid="3971695875449640648">"TTY مكتمل"</item>
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="dtmf_tones_title" msgid="5163153771291340803">"‏نغمات DTMF"</string>
-    <string name="dtmf_tones_summary" msgid="3351820372864020331">"‏تعيين طول نغمات DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"نغمات DTMF"</string>
+    <string name="dtmf_tones_summary" msgid="3351820372864020331">"تعيين طول نغمات DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"عادي"</item>
     <item msgid="2883365539347850535">"طويلة"</item>
@@ -459,7 +453,7 @@
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"جارٍ التنشيط..."</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"يُجري الهاتف تنشيطًا لخدمة بيانات الجوّال.\n\nقد يستغرق هذا الأمر ما يصل إلى 5 دقائق."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"هل تريد تخطي التنشيط؟"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"‏إذا تخطيت التنشيط، فلن تتمكن من إجراء مكالمات أو الاتصال بشبكات بيانات الجوال (ومع ذلك، يمكنك الاتصال بشبكات Wi-Fi). إلى أن تنشط هاتفك، ستتم مطالبتك بتنشيطه في كل مرة تشغله فيها."</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"إذا تخطيت التنشيط، فلن تتمكن من إجراء مكالمات أو الاتصال بشبكات بيانات الجوال (ومع ذلك، يمكنك الاتصال بشبكات Wi-Fi). إلى أن تنشط هاتفك، ستتم مطالبتك بتنشيطه في كل مرة تشغله فيها."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"تخطٍ"</string>
     <string name="ota_activate" msgid="1368528132525626264">"تنشيط"</string>
     <string name="ota_title_activate_success" msgid="6570240212263372046">"تم تنشيط الهاتف."</string>
@@ -497,27 +491,27 @@
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"استبعاد"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"الخدمة"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"الإعداد"</string>
-    <string name="voicemail_number_not_set" msgid="6724904736891087856">"‏&lt;لم يتم التعيين&gt;"</string>
-    <string name="other_settings" msgid="3672912580359716394">"اعدادات المكالمات الاخرى"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;لم يتم التعيين&gt;"</string>
+    <string name="other_settings" msgid="3672912580359716394">"إعدادات الاتصال الأخرى"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"الاتصال عبر <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"صورة جهة الاتصال"</string>
     <string name="goPrivate" msgid="865837794424530980">"انتقال إلى مكالمة خاصة"</string>
     <string name="selectContact" msgid="781975788478987237">"تحديد جهة اتصال"</string>
-    <string name="sip_settings" msgid="6699045718560859691">"اعدادات المكالمة عبر الانترنت"</string>
-    <string name="sip_accounts" msgid="2097054001288457163">"‏حسابات المكالمة عبر الانترنت ( SIP)"</string>
+    <string name="sip_settings" msgid="6699045718560859691">"إعدادات الاتصال عبر الإنترنت"</string>
+    <string name="sip_accounts" msgid="2097054001288457163">"حسابات الاتصال عبر الإنترنت (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"الحسابات"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"تلقي المكالمات الواردة"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"يقلل من عمر البطارية"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"استخدام الاتصال عبر الإنترنت"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"‏استخدام الاتصال عبر الإنترنت (Wi-Fi فقط)"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"استخدام الاتصال عبر الإنترنت (Wi-Fi فقط)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"لكل المكالمات عند توفر شبكة البيانات"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"فقط للمكالمات عبر الإنترنت"</string>
-    <string name="sip_call_options_entry_3" msgid="7474809001402649185">"السؤال لكل مكالمة"</string>
+    <string name="sip_call_options_entry_3" msgid="7474809001402649185">"المطالبة لكل اتصال"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"لكل المكالمات"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"إجراء اتصال"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"استخدام حساب الاتصال عبر الإنترنت:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"الاستخدام دومًا لإجراء مكالمات عبر الإنترنت"</string>
-    <string name="reset_my_choice_hint" msgid="5523030209803567922">"‏يمكنك تغيير حساب مكالمات الإنترنت الذي تريد استخدامه افتراضيًا من الهاتف &gt; إعدادات &gt; إعدادات مكالمات لإنترنت &gt; شاشة الحسابات."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"يمكنك تغيير حساب مكالمات الإنترنت الذي تريد استخدامه افتراضيًا من الهاتف &gt; إعدادات &gt; إعدادات مكالمات لإنترنت &gt; شاشة الحسابات."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"اتصال عبر هاتف خلوي"</string>
     <string name="internet_phone" msgid="1147922660195095810">"مكالمة عبر الإنترنت"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"ليس هناك حساب اتصال عبر الإنترنت"</string>
@@ -525,7 +519,7 @@
     <string name="sip_menu_add" msgid="8757508498518881500">"إضافة"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"إضافة حساب"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"إزالة الحساب"</string>
-    <string name="sip_account_list" msgid="5480058210652194306">"‏حسابات SIP"</string>
+    <string name="sip_account_list" msgid="5480058210652194306">"حسابات SIP"</string>
     <string name="saving_account" msgid="52903398217017954">"جارٍ حفظ الحساب..."</string>
     <string name="removing_account" msgid="7183999896088628100">"جارٍ إزالة الحساب..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"حفظ"</string>
@@ -539,15 +533,15 @@
     <string name="registration_status_still_trying" msgid="3185581992666091911">"لا تزال المحاولة مستمرة..."</string>
     <string name="registration_status_not_receiving" msgid="4185572774980557758">"عدم استلام مكالمات."</string>
     <string name="registration_status_no_data" msgid="4901476962360656611">"توقف تسجيل الحساب نظرًا لعدم توفر اتصال بالإنترنت."</string>
-    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"‏توقف تسجيل الحساب نظرًا لعدم توفر اتصال Wi-Fi."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"توقف تسجيل الحساب نظرًا لعدم توفر اتصال Wi-Fi."</string>
     <string name="registration_status_not_running" msgid="4824867184446232131">"لم يتم تسجيل الحساب بنجاح."</string>
     <string name="registration_status_done" msgid="884630717456439280">"جارٍ استلام مكالمات."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"لم يتم تسجيل الحساب بنجاح: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)؛ ستتم المحاولة لاحقًا"</string>
     <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"لم يتم تسجيل الحساب بنجاح: اسم مستخدم غير صحيح أو كلمة مرور غير صحيحة."</string>
     <string name="registration_status_server_unreachable" msgid="5733421582468991276">"لم يتم تسجيل الحساب بنجاح: تحقق من اسم الخادم."</string>
     <string name="third_party_account_summary" msgid="2532526738862533028">"هذا الحساب قيد الاستخدام حاليًا من خلال تطبيق <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
-    <string name="sip_edit_title" msgid="489288416435014385">"‏تفاصيل حساب SIP"</string>
-    <string name="sip_edit_new_title" msgid="3659149255856520385">"‏تفاصيل حساب SIP"</string>
+    <string name="sip_edit_title" msgid="489288416435014385">"تفاصيل حساب SIP"</string>
+    <string name="sip_edit_new_title" msgid="3659149255856520385">"تفاصيل حساب SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"الخادم"</string>
     <string name="username_title" msgid="2479375923477682328">"اسم المستخدم"</string>
     <string name="password_title" msgid="3323555249068171531">"كلمة المرور"</string>
@@ -561,17 +555,17 @@
     <string name="advanced_settings" msgid="8350631795335495338">"الإعدادات الاختيارية"</string>
     <string name="auth_username_title" msgid="851473016307947120">"اسم المستخدِم للمصادقة"</string>
     <string name="auth_username_summary" msgid="6782012405225938629">"اسم المستخدِم المستخدَم للمصادقة"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"‏&lt;لم يتم تعيينه&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"‏&lt;مثل اسم المستخدم&gt;"</string>
-    <string name="optional_summary" msgid="1464058793789832411">"‏&lt;اختياري&gt;"</string>
+    <string name="default_preference_summary" msgid="868766740121667450">"&lt;لم يتم تعيينه&gt;"</string>
+    <string name="display_name_summary" msgid="8636377460518225523">"&lt;مثل اسم المستخدم&gt;"</string>
+    <string name="optional_summary" msgid="1464058793789832411">"&lt;اختياري&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ المس لإظهار الكل"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ المس لإخفاء الكل"</string>
     <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> مطلوب ولا يمكن تركه فارغًا."</string>
     <string name="not_a_valid_port" msgid="4796149266434630292">"يجب أن يكون رقم المنفذ ما بين 1000 و65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"لا يوجد اتصال بالإنترنت"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"‏ليس هناك اتصال Wi-Fi"</string>
+    <string name="no_wifi_available_title" msgid="747881033089378758">"ليس هناك اتصال Wi-Fi"</string>
     <string name="no_internet_available" msgid="7877142631803238549">"لإجراء مكالمة إنترنت، تحقق من اتصالك بالإنترنت أولاً."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"‏يلزمك الاتصال بشبكة Wi-Fi لإجراء مكالمات عبر الإنترنت (استخدم إعدادات اللاسلكي والشبكة)."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"يلزمك الاتصال بشبكة Wi-Fi لإجراء مكالمات عبر الإنترنت (استخدم إعدادات اللاسلكي والشبكة)."</string>
     <string name="no_voip" msgid="8901474054537199865">"الاتصال عبر الإنترنت غير معتمد"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"تلقائي"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"الإرسال دائمًا"</string>
@@ -604,7 +598,7 @@
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"تم تمكين مكبر صوت الهاتف."</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"تم كتم صوت المكالمة."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"رد"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"‏إرسال رسائل قصيرة SMS"</string>
+    <string name="description_target_send_sms" msgid="2098326025587950144">"إرسال رسائل قصيرة SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"رفض"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"الاهتزاز"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"الاهتزاز"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2aa3997..f26ed8d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -136,11 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Выбраць аўтаматычна"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Аўтаматычна выбраць прыярытэтную сетку"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Аўтаматычная рэгістрацыя..."</string>
-    <!-- no translation found for preferred_network_mode_title (2336624679902659306) -->
-    <skip />
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Сеткавы рэжым"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змяніць рэжым работы сеткі"</string>
-    <!-- no translation found for preferred_network_mode_dialogtitle (4048082093347807230) -->
-    <skip />
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Пераважны сеткавы рэжым"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Пераважны рэжым сеткі: пераважна WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Пераважны рэжым сеткі: толькі GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Пераважны рэжым сеткі: толькі WCDMA"</string>
@@ -277,12 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Мульці-катэгорыя"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Мульці-катэгорыя ўключана"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Мульці-катэгорыя адключаная"</string>
-    <!-- no translation found for network_lte (7702681952521375754) -->
-    <skip />
-    <!-- no translation found for network_4G (2723512640529983138) -->
-    <skip />
-    <!-- no translation found for network_global (1323190488685355309) -->
-    <skip />
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Выбар сістэмы"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Змяніць рэжым роўмінгу CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Выбар сістэмы"</string>
@@ -343,8 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN не быў абноўлены, таму што вы набралі няправільны PIN-код."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN не абноўлены, таму што нумар не можа бвць больш за 20 знакаў."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Cпiс дазволеных нумароў не адноўлены. PIN2 ўведзены няправiльна, або нумар быў адхiлены."</string>
-    <!-- no translation found for fdn_failed (540018079008319747) -->
-    <skip />
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Чытанне з SIM-карты..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"На вашай SIM-карце няма кантактаў."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Выберыце кантакты для імпарту"</string>
@@ -365,8 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN-код SIM-карты адключаны."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Вы набралі няправільны PIN-код."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN-код SIM-карты паспяхова зменены."</string>
-    <!-- no translation found for puk_requested (1796577128488773946) -->
-    <skip />
+    <string name="puk_requested" msgid="3898394204193202803">"Пароль няправільны, SIM заблакаваная! Патрабуецца PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Стары PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Новы PIN2"</string>
@@ -378,15 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Увядзіце PUK2, які складаецца з 8 лічбаў."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Код PIN2 паспяхова зменены."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Увядзіце PUK2-код"</string>
-    <!-- no translation found for fdn_enable_puk2_requested (3674058967950559397) -->
-    <skip />
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Няправільны пароль. Змяніце код PIN2 і паспрабуйце яшчэ раз."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Няправiльны пароль. SIM-карта заблакавана. Патрабуецца код PUK2."</string>
-    <!-- no translation found for puk2_blocked (3150263853077280049) -->
-    <skip />
-    <!-- no translation found for pin2_attempts (7937503107162525324) -->
-    <skip />
-    <!-- no translation found for pin2_unblocked (2903147240919055381) -->
-    <skip />
     <string name="doneButton" msgid="2859593360997984240">"Гатова"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Канферэнц-выклік <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Нумар галасавой пошты"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 656c67e..6177fb5 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Автоматичен избор"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Автоматичен избор на предпочитана мрежа"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Регистрира се автоматично..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Предпочитан тип мрежа"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Режим на мрежата"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промяна на операционния режим на мрежата"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Предпочитан тип мрежа"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Предпочитан режим на мрежата"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Предпочитан режим на мрежата: Предпочита се WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Предпочитан режим на мрежата: Само GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Предпочитан режим на мрежата: Само WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Мултикатегория"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Мултикатегорията е активирана"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Мултикатегорията е деактивирана"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (препоръчително)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (препоръчително)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Глобална"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Избор на система"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Промяна на режима на роуминг на CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Избор на система"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активиране на устройството"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Настройка на услугата за данни"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Настройки за оператора"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Фиксирани номера за набиране"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Списък с FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Активиране на FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN не бе актуализирано, защото сте въвели неправилен ПИН."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN не бе актуализирано, защото номерът не може да надвишава 20 цифри."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN не е актуализирано. PIN2 бе неправилен или телефонният номер бе отхвърлен."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Операцията с фиксираните номера за набиране (FDN) не бе успешна."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Извършва се четене на данни от SIM картата…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Няма контакти в SIM картата ви."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Избиране на контакти за импортиране"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"ПИН кодът за SIM картата бе деактивиран."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Въведеният ПИН не e правилен."</string>
     <string name="pin_changed" msgid="4365538014588501049">"ПИН кодът за SIM картата бе променен успешно."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Паролата не е правилна, ПИН кодът е блокиран! Въведете PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Паролата не е правилна. SIM картата е заключена! Въведете PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Стар PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Нов PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Въведете PUK2 код с осем цифри."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 бе променен успешно."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Въвеждане на PUK2 код"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Паролата не е правилна, PIN2 е блокиран. Моля, променете го и опитайте отново!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Паролата не е правилна. Променете PIN2 и опитайте отново."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Паролата не е правилна. SIM картата е заключена. Въведете PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 е блокиран завинаги."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Остават <xliff:g id="NUMBER">%d</xliff:g> опита."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 е отблокиран!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Конферентно обаждане<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер за гласова поща"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b201a7f..acd3735 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Selecció automàtica"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Selecciona automàticament la xarxa preferida"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Registre automàtic..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipus de xarxa preferida"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mode de xarxa"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Canvia el mode de funcionament de la xarxa"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipus de xarxa preferida"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mode de xarxa preferit"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Mode de xarxa preferit: WCDMA preferit"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Mode de xarxa preferit: només GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Mode de xarxa preferit: només WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multicategoria"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multicategoria activada"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multicategoria desactivada"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (opció recomanada)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (opció recomanada)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Selecció del sistema"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Canvia el mode d\'itinerància CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selecció del sistema"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activació del dispositiu"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configuració del servei de dades"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Configuració d\'operador"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Números de marcatge fix"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Llista FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activació d\'FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN no s\'ha actualitzat ja que has escrit un PIN incorrecte."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN no s\'ha actualitzat ja que el nombre no pot excedir els 20 dígits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"El número FDN no s\'ha actualitzat. El PIN2 no és correcte o bé s\'ha rebutjat el número de telèfon."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Hi ha hagut un problema en l\'operació FDN."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"S\'està llegint de la targeta SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No hi ha cap contacte a la targeta SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccioneu contactes per importar-los"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN de la SIM desactivat."</string>
     <string name="pin_failed" msgid="2298841192582192277">"El PIN que has escrit és incorrecte."</string>
     <string name="pin_changed" msgid="4365538014588501049">"El PIN de la SIM s\'ha modificat correctament."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"La contrasenya no és correcta; s\'ha bloquejat el PIN. S\'ha sol·licitat el PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Contrasenya incorrecta; s\'ha bloquejat la SIM. S\'ha sol·licitat el codi PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antic"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 nou"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Escriviu un PUK2 de 8 números."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"El PIN2 s\'ha modificat correctament."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Escriviu el codi PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"La contrasenya no és correcta; s\'ha bloquejat el PIN2. Canvia el PIN2 i torna-ho a provar."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Contrasenya incorrecta. Canvia el PIN2 i torna-ho a provar."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Contrasenya incorrecta; s\'ha bloquejat la SIM. S\'ha sol·licitat el codi PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"El PUK2 s\'ha bloquejat de manera permanent."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Queden <xliff:g id="NUMBER">%d</xliff:g> intents."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"S\'ha desbloquejat el PIN2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Fet"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Trucada de conferència <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número del correu de veu"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e1e0e80..4eb927b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Zvolit automaticky"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automaticky zvolit upřednostňovanou síť"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatická registrace..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferovaný typ sítě"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Režim sítě"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Změnit provozní režim sítě"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferovaný typ sítě"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Upřednostňovaný režim sítě"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Upřednostňovaný režim sítě: preferováno WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Upřednostňovaný režim sítě: pouze GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Upřednostňovaný režim sítě: pouze WCDMA"</string>
@@ -188,11 +188,11 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Uplynulo <xliff:g id="USED_0">%1$d</xliff:g>٪ cyklu\nPočet dní do začátku dalšího období: <xliff:g id="USED_1">%2$d</xliff:g> (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"V případě překročení limitu využití dat se přenosová rychlost sníží na <xliff:g id="USED">%1$d</xliff:g> kb/s"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Další informace o zásadách využití dat v mobilní síti vašeho mobilního operátora"</string>
-    <string name="cell_broadcast_sms" msgid="5584192824053625842">"Zprávy SMS informační služby"</string>
-    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Zprávy SMS informační služby"</string>
-    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Zprávy SMS informační služby povoleny"</string>
-    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"Zprávy SMS informační služby zakázány"</string>
-    <string name="cb_sms_settings" msgid="651715019785107312">"Nastavení zpráv SMS informační služby"</string>
+    <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Cell Broadcast"</string>
+    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Cell Broadcast"</string>
+    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS Cell Broadcast povoleny"</string>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"SMS Cell Broadcast zakázány"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"Nastavení SMS Cell Broadcast"</string>
     <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Tísňové vysílání"</string>
     <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Tísňové vysílání povoleno"</string>
     <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Tísňové vysílání zakázáno"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Více kategorií"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Více kategorií povoleno"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Více kategorií zakázáno"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (doporučeno)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (doporučeno)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globální"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Výběr systému"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Změnit režim roamingu CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Výběr systému"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivovat zařízení"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastavit datovou službu"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Nastavení operátora"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Povolená telefonní čísla"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Seznam povolených telefonních čísel"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivace povolených telefonních čísel"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Funkce Povolená telefonní čísla nebyla aktualizována, protože jste zadali chybný kód PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Funkce Povolená telefonní čísla nebyla aktualizována, protože číslo nesmí obsahovat více než 20 číslic."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Povolená telefonní čísla (FDN) nebyla aktualizována. Kód PIN2 byl nesprávný nebo bylo telefonní číslo odmítnuto."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operace s čísly FDN se nezdařila."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čtení ze SIM karty..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Na SIM kartě nejsou žádné kontakty."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Vybrat kontakty pro import"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN SIM karty je zakázán."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Zadaný kód PIN není správný."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN SIM karty byl úspěšně změněn."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Nesprávné heslo, kód PIN je zablokován. Je požadován kód PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Neplatné heslo, SIM karta je zablokována. Zadejte kód PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Původní kód PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nový kód PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Zadejte 8místný kód PUK2."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Kód PIN2 byl úspěšně změněn."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Zadejte kód PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Nesprávné heslo, kód PIN2 je zablokován. Změňte kód PIN2 a zkuste to znovu!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Heslo není správné. Změňte kód PIN2 a zkuste to znovu."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Neplatné heslo, SIM karta je zablokována. Je požadován kód PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 je trvale zablokován."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Počet zbývajících pokusů: <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Kód PIN2 byl odblokován!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Hotovo"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenční hovor <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Číslo hlasové schránky"</string>
@@ -527,7 +521,7 @@
     <string name="remove_sip_account" msgid="7645900420385682570">"Odebrat účet"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Účty SIP"</string>
     <string name="saving_account" msgid="52903398217017954">"Ukládání účtu..."</string>
-    <string name="removing_account" msgid="7183999896088628100">"Odstraňování účtu..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Odebírání účtu..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Uložit"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Zahodit"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Zavřít profil"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 2569e3f..89cc2a4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Vælg automatisk"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Vælg automatisk det foretrukne netværk"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Foretrukken netværkstype"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Netværkstilstand"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Skift netværksdriftstilstand"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Foretrukken netværkstype"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Foretrukken netværkstilstand"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Foretrukken netværkstilstand: WCDMA foretrækkes"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Foretrukken netværkstilstand: kun GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Foretrukken netværkstilstand: kun WCDMA"</string>
@@ -281,9 +281,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Flere kategorier"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Flere kategorier er aktiveret"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Flere kategorier er deaktiveret"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (anbefales)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (anbefales)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Vælg system"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Skift CDMA-roamingtilstand"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Vælg system"</string>
@@ -304,7 +301,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivér enhed"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Opsætning af datatjeneste"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Indst. for mobilselskab"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Faste opkaldsnumre"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste over faste opkald"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivering af faste opkald"</string>
@@ -343,7 +341,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Fast opkaldsnummer blev ikke opdateret, fordi du har indtastet en forkert PIN-kode."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN blev ikke opdateret, fordi antallet ikke må overstige 20 cifre."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN blev ikke opdateret. PIN2-koden var forkert, eller telefonnummeret blev afvist."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN-handlingen mislykkedes."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Læser fra SIM-kort ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Der er ingen kontakter på dit SIM-kort."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Vælg kontakter, der skal importeres"</string>
@@ -364,7 +361,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Pinkoden til SIM-kortet er deaktiveret."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Den indtastede pinkode var forkert."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Pinkoden til SIM-kortet er ændret."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Forkert adgangskode. Pinkoden blev blokeret. PUK-koden skal indtastes."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Adgangskoden er forkert. SIM-kortet er låst. PUK2-kode er påkrævet."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2-kode"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Nuværende PIN2-kode"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Ny PIN2-kode"</string>
@@ -376,11 +373,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Indtast en PUK2-kode på 8 tal."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2-koden blev ændret."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Indtast PUK2-kode"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Forkert adgangskode. PIN2 blev blokeret. Skift PIN2-koden, og prøv igen."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Forkert adgangskode. Skift PIN2-kode, og prøv igen."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Adgangskoden er forkert. SIM-kortet er låst. PUK2-kode er påkrævet."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 er permanent blokeret."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Der er <xliff:g id="NUMBER">%d</xliff:g> forsøg tilbage."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Blokeringen af PIN2 blev ophævet."</string>
     <string name="doneButton" msgid="2859593360997984240">"Afslut"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonmøde <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemailnummer"</string>
@@ -586,7 +580,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="6158880869935281078">"Skriv dit eget svar..."</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 1a1db8b..138dc17 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Automatisch auswählen"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Bevorzugtes Netzwerk automatisch auswählen"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatische Registrierung..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Bevorzugter Netzwerktyp"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Netzwerkmodus"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Netzwerkbetriebsmodus ändern"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Bevorzugter Netzwerktyp"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Bevorzugter Netzwerkmodus"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Bevorzugter Netzwerkmodus: WCDMA bevorzugt"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Bevorzugter Netzwerkmodus: nur GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Bevorzugter Netzwerkmodus: nur WCDMA"</string>
@@ -279,9 +279,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Mehrere Kategorien"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Mehrere Kategorien aktiviert"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Mehrere Kategorien deaktiviert"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (empfohlen)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (empfohlen)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Systemauswahl"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA-Roamingmodus ändern"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemauswahl"</string>
@@ -302,7 +299,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Gerät aktivieren"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Datendienst einrichten"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Anbietereinstellungen"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Anrufbegrenzung"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Zugelassene Rufnummern"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivierung der Anrufbegrenzung"</string>
@@ -341,7 +339,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Die Anrufbegrenzung wurde nicht aktualisiert, weil Sie eine falsche PIN eingegeben haben."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Die Anrufbegrenzung wurde nicht aktualisiert, weil die Nummer maximal 20 Ziffern enthalten darf."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wurde nicht aktualisiert. PIN2 war ungültig oder die Telefonnummer wurde abgelehnt."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Fehler bei der Nummernbeschränkung"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM-Karte wird ausgelesen..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Keine Kontakte auf SIM-Karte"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Kontakte für Import auswählen"</string>
@@ -362,7 +359,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN-Abfrage für SIM-Karte deaktiviert"</string>
     <string name="pin_failed" msgid="2298841192582192277">"Die eingegebene PIN ist falsch."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN der SIM-Karte geändert"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Falsches Passwort, PIN wurde gesperrt. PUK ist erforderlich."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Passwort falsch, SIM-Karte gesperrt! Eingabe des PUK2 erforderlich."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Alte PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Neue PIN2"</string>
@@ -374,11 +371,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Geben Sie einen 8-stelligen PUK2 ein."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 geändert"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 eingeben"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Falsches Passwort. PIN2 wurde gesperrt. Bitte ändern Sie die PIN2 und versuchen Sie es erneut."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Passwort falsch. Ändern Sie die PIN2 und versuchen Sie es erneut."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Passwort falsch, SIM-Karte gesperrt. Eingabe des PUK2 erforderlich."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 wurde endgültig gesperrt."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Sie haben noch <xliff:g id="NUMBER">%d</xliff:g> Versuche."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 entsperrt"</string>
     <string name="doneButton" msgid="2859593360997984240">"Fertig"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonkonferenz <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Mailboxnummer"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8af1c48..0c18bd1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Αυτόματη επιλογή"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Αυτόματη επιλογή προτιμώμενου δικτύου"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Αυτόματη εγγραφή..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Προτιμώμενος τύπος δικτύου"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Λειτουργία δικτύου"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Αλλαγή κατάστασης λειτουργίας δικτύου"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Προτιμώμενος τύπος δικτύου"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Προτιμώμενη λειτουργία δικτύου"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Προτιμώμενη λειτουργία δικτύου: προτιμώμενο WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Προτιμώμενη λειτουργία δικτύου: μόνο GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Προτιμώμενη λειτουργία δικτύου: μόνο WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Πολλές κατηγορίες"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Ενεργοποιήθηκε η προβολή πολλών κατηγοριών"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Απενεργοποιήθηκε η προβολή πολλών κατηγοριών"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (συνιστάται)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (συνιστάται)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Παγκοσμίως"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Επιλογή συστήματος"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Αλλαγή της λειτουργίας περιαγωγής CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Επιλογή συστήματος"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ενεργοποίηση συσκευής"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ρύθμιση υπηρεσίας δεδομένων"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Ρυθμ. εταιρ. κιν. τηλεφ."</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Αριθμοί κλήσης καθορισμένων αριθμών"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Λίστα FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Ενεργοποίηση FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Το FDN δεν ενημερώθηκε, επειδή πληκτρολογήσατε εσφαλμένο PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Το FDN δεν ενημερώθηκε διότι ο αριθμός δεν μπορεί να ξεπερνάει τα 20 ψηφία."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Δεν έγινε ενημέρωση του FDN. Το PIN2 ήταν λανθασμένο ή ο αριθμός του τηλεφώνου απορρίφθηκε."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Αποτυχία λειτουργίας FDN."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Ανάγνωση από κάρτα SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Δεν υπάρχουν επαφές στην κάρτα SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Επιλέξτε επαφές για εισαγωγή"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Το PIN της κάρτας SIM απενεργοποιήθηκε."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Ο αριθμός PIN που πληκτρολογήσατε ήταν λανθασμένος."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Ο αριθμός PIN της κάρτας SIM άλλαξε επιτυχώς."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Εσφαλμένος κωδικός πρόσβασης. Ο κωδικός PIN έχει μπλοκαριστεί! Απαιτείται η εισαγωγή του κωδικού PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Λανθασμένος κωδικός πρόσβασης, η κάρτα SIM κλειδώθηκε! Ζητήθηκε κωδικός PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"Αριθμός PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Παλιός αριθμός PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Νέος αριθμός PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Πληκτρολογήστε έναν αριθμό PUK2 που αποτελείται από 8 αριθμούς."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Η αλλαγή του αριθμού PIN2 ήταν επιτυχημένη."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Πληκτρολογήστε τον κώδικα PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Εσφαλμένος κωδικός πρόσβασης. Ο κωδικός PIN2 έχει μπλοκαριστεί. Αλλάξτε κωδικό PIN2 και προσπαθήστε ξανά!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Ο κωδικός πρόσβασης είναι λανθασμένος. Αλλάξτε τον αριθμό PIN2 και δοκιμάστε ξανά!"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Λανθασμένος κωδικός πρόσβασης, η κάρτα SIM κλειδώθηκε. Ζητήθηκε κωδικός PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"Ο κωδικός PUK2 έχει μπλοκαριστεί οριστικά."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Απομένουν <xliff:g id="NUMBER">%d</xliff:g> προσπάθειες."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Απεμπλοκή PIN2!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Τέλος"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Κλήση συνδιάσκεψης <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Αριθμός αυτόματου τηλεφωνητή"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 80b0579..d860932 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Choose automatically"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automatically choose preferred network"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatic registration..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferred network type"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Network Mode"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferred network mode"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Preferred network mode: WCDMA only"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-category"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multi-category enabled"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multi-category disabled"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recommended)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recommended)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"System select"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Change the CDMA roaming mode"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"System select"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activate device"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Set up data service"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Provider settings"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Fixed Dialling Numbers"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN list"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN activation"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN wasn\'t updated because you typed an incorrect PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN wasn\'t updated because the number can\'t exceed 20 digits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wasn\'t updated. The PIN2 was incorrect or the phone number was rejected."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN operation failed."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Reading from SIM card…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No contacts on your SIM card."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Select contacts to import"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN disabled."</string>
     <string name="pin_failed" msgid="2298841192582192277">"The PIN that you typed was incorrect."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM PIN changed successfully."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Password incorrect, PIN Blocked! PUK requested."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Password incorrect; SIM is locked! PUK2 requested."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Old PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"New PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Type a PUK2 that is 8 numbers."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 changed successfully."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Type PUK2 code"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Password incorrect, PIN2 Blocked. Please change PIN2 and retry!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Password incorrect. Change PIN2 and retry."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Password incorrect, SIM is locked. PUK2 requested."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanently blocked."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"There are <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 Unblocked!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Done"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 80b0579..d860932 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Choose automatically"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automatically choose preferred network"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatic registration..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferred network type"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Network Mode"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferred network type"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferred network mode"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Preferred network mode: WCDMA only"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-category"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multi-category enabled"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multi-category disabled"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recommended)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recommended)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"System select"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Change the CDMA roaming mode"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"System select"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activate device"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Set up data service"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Provider settings"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Fixed Dialling Numbers"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN list"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN activation"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN wasn\'t updated because you typed an incorrect PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN wasn\'t updated because the number can\'t exceed 20 digits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wasn\'t updated. The PIN2 was incorrect or the phone number was rejected."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN operation failed."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Reading from SIM card…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No contacts on your SIM card."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Select contacts to import"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN disabled."</string>
     <string name="pin_failed" msgid="2298841192582192277">"The PIN that you typed was incorrect."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM PIN changed successfully."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Password incorrect, PIN Blocked! PUK requested."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Password incorrect; SIM is locked! PUK2 requested."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Old PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"New PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Type a PUK2 that is 8 numbers."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 changed successfully."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Type PUK2 code"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Password incorrect, PIN2 Blocked. Please change PIN2 and retry!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Password incorrect. Change PIN2 and retry."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Password incorrect, SIM is locked. PUK2 requested."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanently blocked."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"There are <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 Unblocked!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Done"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 2303977..978998b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -91,7 +91,7 @@
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Reenviar a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Deshabilitado"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Tu proveedor no admite la inhabilitación del desvío de llamadas cuando tu teléfono no responde."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Reenviar si no llega"</string>
+    <string name="labelCFNRc" msgid="47183615370850000">"Reenv. si no se alcanza"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se puede alcanzar"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Reenviar a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desactivado"</string>
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Elegir automáticamente"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Elegir la red preferida automáticamente"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Registro automático…"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de red preferido"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modo de red"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambiar el modo operativo de la red"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de red preferido"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modo de red preferido"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modo de red preferido: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modo de red preferido: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modo de red preferido: solo WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Varias categorías"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Varias categorías activadas"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Varias categorías desactivadas"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recomendado)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recomendado)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistema seleccionado"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Cambiar el modo itinerancia CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistema seleccionado"</string>
@@ -298,8 +295,9 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activar dispositivo"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar servicio de datos"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Config. del proveedor"</string>
-    <string name="fdn" msgid="7878832555095183202">"Números de marc. fijos"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
+    <string name="fdn" msgid="7878832555095183202">"Números de marcación fijos"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de NMF"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activación de NMF"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Los números de marcación fija están activados"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"No se actualizó el FDN porque ingresaste un PIN incorrecto."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"No se actualizó el FDN porque el número no puede superar los 20 dígitos."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"No se actualizó el FDN. El PIN2 era incorrecto o se rechazó el número de teléfono."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Ocurrió un error de funcionamiento con el número de marcado fijo."</string>
     <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>
@@ -358,9 +355,9 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Se desactivó el PIN de la tarjeta SIM."</string>
     <string name="pin_failed" msgid="2298841192582192277">"El PIN que ingresaste era incorrecto."</string>
     <string name="pin_changed" msgid="4365538014588501049">"El PIN de la tarjeta SIM se modificó correctamente."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"La contraseña es incorrecta; se bloqueó el PIN. Ingresa el código PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Contraseña incorrecta. La tarjeta SIM está bloqueada. Se solicitó PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 anterior"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 viejo"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 nuevo"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmar PIN2 nuevo"</string>
     <string name="badPuk2" msgid="4851734468010000418">"El PUK2 que ingresaste es incorrecto. Vuelve a intentarlo."</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Escribe un PUK2 de 8 cifras."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"El PIN2 se modificó correctamente."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Escribir código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"La contraseña es incorrecta; se bloqueó el PIN2. Cambia el PIN2 y vuelve a intentarlo."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Contraseña incorrecta. Cambia el PIN2 y vuelve a intentarlo."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Contraseña incorrecta, se bloqueó la tarjeta SIM. Se solicita el PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"El código PUK2 se bloqueó de forma permanente."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Te quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado"</string>
     <string name="doneButton" msgid="2859593360997984240">"Finalizado"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Llamada en conferencia <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Núm. de correo de voz"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ecdad96..d4c5e2f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Seleccionar automáticamente"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Seleccionar red preferida automáticamente"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Registro automático..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de red preferido"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modo de red"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambiar el modo operativo de la red"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de red preferido"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferencia de modo de red"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modo de red preferido: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modo de red preferido: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modo de red preferido: solo WCDMA"</string>
@@ -279,9 +279,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Categoría múltiple"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Categoría múltiple habilitada"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Categoría múltiple inhabilitada"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recomendado)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recomendado)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Mundial"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Selección de sistema"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Cambiar modo de itinerancia CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selección de sistema"</string>
@@ -302,7 +299,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activar dispositivo"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar servicio de datos"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Ajustes del operador"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Marcación fija"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activación de FDN"</string>
@@ -341,7 +339,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"No se ha actualizado FDN porque el código PIN que has introducido es incorrecto."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"No se ha actualizado FDN porque el número no puede superar los 20 dígitos."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN no actualizado. El código PIN2 era incorrecto o se ha rechazado el número de teléfono."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Error de funcionamiento de número de marcación fija."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leyendo desde tarjeta SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No hay ningún contacto en la tarjeta SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccionar contactos para importar"</string>
@@ -362,7 +359,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"El código PIN de la tarjeta SIM está inhabilitado."</string>
     <string name="pin_failed" msgid="2298841192582192277">"El código PIN que has introducido era incorrecto."</string>
     <string name="pin_changed" msgid="4365538014588501049">"El código PIN de la tarjeta SIM se ha cambiado correctamente."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Contraseña incorrecta, PIN bloqueado. Debes introducir el PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Contraseña incorrecta; la tarjeta SIM está bloqueada. Se ha solicitado el código PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antiguo"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 nuevo"</string>
@@ -374,11 +371,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Introduce un código PUK2 con una longitud de 8 dígitos."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"El código PIN2 se ha cambiado correctamente."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Introducir código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Contraseña incorrecta, PIN2 bloqueado. Cambia el PIN2 y vuelve a intentarlo."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Contraseña incorrecta. Cambia el código PIN2 y vuelve a intentarlo."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Contraseña incorrecta; la tarjeta SIM está bloqueada. Se ha solicitado el código PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"El PUK2 se ha bloqueado de forma permanente."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado"</string>
     <string name="doneButton" msgid="2859593360997984240">"Listo"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conferencia telefónica<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número del buzón de voz"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index c420eec..dcdf515 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Vali automaatselt"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Vali automaatselt eelistatud võrk"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automaatne registreerimine ..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Eelistatud võrgutüüp"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Võrgurežiim"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Muuda võrgu töörežiimi"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Eelistatud võrgutüüp"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Eelistatud võrgurežiim"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Eelistatud võrgurežiim: eelistatud WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Eelistatud võrgurežiim: ainult GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Eelistatud võrgurežiim: ainult WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multikategooria"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multi-kategooria lubatud"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multikategooria keelatud"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (soovitatav)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (soovitatav)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Üldine"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Süsteemi valik"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Muuda CDMA-rändlusrežiimi"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Süsteemi valik"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Seadme aktiveerimine"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Andmesideteenuse häälestamine"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Operaatori seaded"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Fikseeritud valimisnumbrid"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-i loend"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-i aktiveerimine"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN-i ei värskendatud, sest sisestasite vale PIN-koodi."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN-i ei värskendatud, sest number ei tohi olla pikem kui 20 kohta."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN-i ei värskendatud. PIN2 oli vale või lükati telefoninumber tagasi."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN-i toiming ebaõnnestus."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM-kaardilt lugemine ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Teie SIM-kaardil pole ühtegi kontakti."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Valige imporditavad kontaktid"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM-kaardi PIN-kood on keelatud."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Sisestasite vale PIN-koodi."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM-kaardi PIN-koodi muutmine õnnestus."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Parool on vale, PIN-kood on blokeeritud. PUK-kood on nõutav."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Parool on vale, SIM-kaart on lukus. Vajalik on PUK2-kood."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Vana PIN2-kood"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Uus PIN2-kood"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Sisestage 8-numbriline PUK2."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2-koodi muutmine õnnestus."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Sisestage PUK2-kood"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Parool on vale, PIN2 on blokeeritud. Muutke PIN2 ja proovige uuesti."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Parool on vale. Muutke PIN2-koodi ja proovige uuesti."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Parool on vale, SIM-kaart on lukus. Sisestage PUK2-kood."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 on püsivalt blokeeritud."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Alles on jäänud <xliff:g id="NUMBER">%d</xliff:g> katset."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 on deblokeeritud."</string>
     <string name="doneButton" msgid="2859593360997984240">"Valmis"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konverentskõne <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Kõnepostinumber"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index fffa844..7d7f29e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -20,16 +20,16 @@
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"گوشی"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"شماره گیری اضطراری"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"تلفن"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"‏لیست FDN"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"لیست FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"ناشناس"</string>
     <string name="private_num" msgid="6713286113000232309">"شماره خصوصی"</string>
     <string name="payphone" msgid="1931775086311769314">"تلفن سکه ای"</string>
     <string name="onHold" msgid="9035493194749959955">"در انتظار"</string>
-    <string name="mmiStarted" msgid="6347869857061147003">"‏کد MMI راه‌اندازی شد"</string>
-    <string name="ussdRunning" msgid="485588686340541690">"‏در حال اجرای کد USSD..."</string>
-    <string name="mmiCancelled" msgid="2771923949751842276">"‏کد MMI لغو شد"</string>
+    <string name="mmiStarted" msgid="6347869857061147003">"کد MMI راه‌اندازی شد"</string>
+    <string name="ussdRunning" msgid="485588686340541690">"در حال اجرای کد USSD..."</string>
+    <string name="mmiCancelled" msgid="2771923949751842276">"کد MMI لغو شد"</string>
     <string name="cancel" msgid="5044513931633602634">"لغو"</string>
-    <string name="enter_input" msgid="1810529547726803893">"‏طول پیام USSD باید بین <xliff:g id="MIN_LEN">%d</xliff:g> تا <xliff:g id="MAX_LEN">%d</xliff:g> نویسه باشد. لطفاً دوباره امتحان کنید."</string>
+    <string name="enter_input" msgid="1810529547726803893">"طول پیام USSD باید بین <xliff:g id="MIN_LEN">%d</xliff:g> تا <xliff:g id="MAX_LEN">%d</xliff:g> نویسه باشد. لطفاً دوباره امتحان کنید."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"مدیریت تماس کنفرانس"</string>
     <string name="ok" msgid="3811371167865772377">"تأیید"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"بلندگو"</string>
@@ -52,8 +52,8 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"در حال درخواست بازگشایی قفل شبکه..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"درخواست قفل گشایی شبکه ناموفق بود."</string>
     <string name="unlock_success" msgid="6770085622238180152">"قفل گشایی شبکه با موفقیت انجام شد."</string>
-    <string name="labelGSMMore" msgid="5930842194056092106">"‏تنظیمات تماس GSM"</string>
-    <string name="labelCDMAMore" msgid="1630676740428229339">"‏تنظیمات تماس CDMA"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"تنظیمات تماس GSM"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"تنظیمات تماس CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"نام‌های نقاط دسترسی"</string>
     <string name="settings_label" msgid="3876743539816984008">"تنظیمات شبکه"</string>
     <string name="voicemail" msgid="8693759337917898954">"پست صوتی"</string>
@@ -61,9 +61,9 @@
     <string name="networks" msgid="8873030692174541976">"اپراتورهای شبکه"</string>
     <string name="call_settings" msgid="6112441768261754562">"تنظیمات تماس"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"تنظیمات دیگر"</string>
-    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"‏سایر تنظیمات تماس فقط GSM"</string>
-    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"‏سایر تنظیمات تماس CDMA"</string>
-    <string name="sum_cdma_call_settings" msgid="284753265979035549">"‏سایر تنظیمات تماس فقط CDMA"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"سایر تنظیمات تماس فقط GSM"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"سایر تنظیمات تماس CDMA"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"سایر تنظیمات تماس فقط CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"تنظیمات سرویس شبکه"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"شناسه تماس گیرنده"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"در حال بارگیری تنظیمات..."</string>
@@ -136,23 +136,23 @@
     <string name="select_automatically" msgid="5628402124471810174">"انتخاب به طور خودکار"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"به صورت خودکار شبکه برگزیده را انتخاب کنید"</string>
     <string name="register_automatically" msgid="6017849844573519637">"ثبت خودکار..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"نوع شبکه برگزیده"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"حالت شبکه"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"تغییر حالت عملکرد شبکه"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"نوع شبکه برگزیده"</string>
-    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"‏حالت شبکه برگزیده: WCDMA برگزیده"</string>
-    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"‏حالت شبکه برگزیده: فقط GSM"</string>
-    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"‏حالت شبکه برگزیده: فقط WCDMA"</string>
-    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"‏حالت شبکه برگزیده: GSM / WCDMA"</string>
-    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"‏حالت شبکه ترجیحی: CDMA"</string>
-    <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_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_dialogtitle" msgid="8176355237105593793">"حالت شبکه برگزیده"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"حالت شبکه برگزیده: WCDMA برگزیده"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"حالت شبکه برگزیده: فقط GSM"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"حالت شبکه برگزیده: فقط WCDMA"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"حالت شبکه برگزیده: GSM / WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"حالت شبکه ترجیحی: CDMA"</string>
+    <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_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 name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"حالت شبکه برگزیده: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -160,13 +160,13 @@
     <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>
+    <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>
@@ -175,8 +175,8 @@
     <string name="roaming_disable" msgid="1843417228755568110">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"اتصال داده خود را از دست داده‌اید، زیرا از شبکه اصلی خود خارج شدید و رومینگ داده خاموش است،"</string>
     <string name="roaming_warning" msgid="7820963598559553967">"رومینگ داده مجاز است؟ ممکن است هزینه‌های رومینگ زیادی برای شما در بر داشته باشد!"</string>
-    <string name="gsm_umts_options" msgid="6538311689850981686">"‏گزینه‌های GSM/UMTS"</string>
-    <string name="cdma_options" msgid="4016822858172249884">"‏گزینه‌های CDMA"</string>
+    <string name="gsm_umts_options" msgid="6538311689850981686">"گزینه‌های GSM/UMTS"</string>
+    <string name="cdma_options" msgid="4016822858172249884">"گزینه‌های CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"مصرف داده"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"داده‌های مورد استفاده در دوره زمانی فعلی"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"مدت زمان مصرف داده"</string>
@@ -275,18 +275,15 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"دسته‌های متعدد"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"دسته‌های متعدد فعال شد"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"دسته‌های متعدد غیر فعال شد"</string>
-    <string name="network_lte" msgid="7702681952521375754">"‏LTE (توصیه شده)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"‏4G (توصیه شده)"</string>
-    <string name="network_global" msgid="1323190488685355309">"سراسری"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"انتخاب سیستم"</string>
-    <string name="cdma_system_select_summary" msgid="60460043745797517">"‏تغییر حالت رومینگ CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"تغییر حالت رومینگ CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"انتخاب سیستم"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"فقط خانه"</item>
     <item msgid="1205664026446156265">"خودکار"</item>
   </string-array>
-    <string name="cdma_subscription_title" msgid="1162564010076763284">"‏اشتراک CDMA"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"‏تغییر بین RUIM/SIM و NV"</string>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"اشتراک CDMA"</string>
+    <string name="cdma_subscription_summary" msgid="2530890766115781140">"تغییر بین RUIM/SIM و NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"اشتراک"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
@@ -298,24 +295,25 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"فعال کردن دستگاه"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"راه‌اندازی سرویس داده"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"تنظیمات شرکت مخابراتی"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"شماره‌های شماره گیری ثابت"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"‏لیست FDN"</string>
-    <string name="fdn_activation" msgid="2156479741307463576">"‏فعال کردن FDN"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"لیست FDN"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"فعال کردن FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"شماره‌های شماره گیری ثابت فعال هستند"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"شماره‌های شماره گیری ثابت غیر فعال هستند"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"‏فعال کردن FDN"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"‏غیر فعال کردن FDN"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"فعال کردن FDN"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"غیر فعال کردن FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"تغییر پین 2"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"‏غیر فعال کردن FDN"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"‏فعال کردن FDN"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"غیر فعال کردن FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"فعال کردن FDN"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"مدیریت شماره‌های شماره گیری ثابت"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"‏تغییر پین برای دسترسی FDN"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"تغییر پین برای دسترسی FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"مدیریت لیست شماره تلفن"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"حریم خصوصی صوتی"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"فعال کردن حالت رازداری پیشرفته"</string>
-    <string name="tty_mode_option_title" msgid="9033098925144434669">"‏حالت TTY"</string>
-    <string name="tty_mode_option_summary" msgid="1073835131534808732">"‏تنظیم حالت TTY"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"حالت TTY"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"تنظیم حالت TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"سعی مجدد خودکار"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"فعال کردن حالت سعی مجدد خودکار"</string>
     <string name="menu_add" msgid="1882023737425114762">"افزودن مخاطب"</string>
@@ -334,10 +332,9 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"حذف شماره شماره گیری ثابت"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"در حال حذف شماره شماره گیری ثابت..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"شماره شماره گیری ثابت حذف شد."</string>
-    <string name="pin2_invalid" msgid="5470854099230755944">"‏FDN به‌روز نشد زیرا یک پین نادرست تایپ کردید."</string>
-    <string name="fdn_invalid_number" msgid="1494755047900009147">"‏FDN به‌روزرسانی نشد زیرا شماره نمی‌تواند بیشتر از 20 رقم باشد."</string>
-    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"‏FDN به‌روز نشد. پین 2 اشتباه بود یا شماره تلفن رد شد."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"‏عملیات FDN ناموفق بود."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN به‌روز نشد زیرا یک پین نادرست تایپ کردید."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN به‌روزرسانی نشد زیرا شماره نمی‌تواند بیشتر از 20 رقم باشد."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN به‌روز نشد. پین 2 اشتباه بود یا شماره تلفن رد شد."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"در حال خواندن سیم کارت..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"مخاطبی در سیم کارت شما موجود نیست."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"انتخاب مخاطبین برای ورود"</string>
@@ -358,23 +355,20 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"پین سیم غیر فعال شد."</string>
     <string name="pin_failed" msgid="2298841192582192277">"پینی که تایپ کردید نادرست است."</string>
     <string name="pin_changed" msgid="4365538014588501049">"پین سیم با موفقیت تغییر کرد."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"‏گذرواژه نادرست است، پین مسدود شد! PUK مورد نیاز است."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"رمز ورود نادرست است، سیم کارت قفل شد! PUK2 مورد نیاز است."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"پین 2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"پین 2 قدیمی"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"پین 2 جدید"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"تأیید پین 2 جدید"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"‏PUK2 که تایپ کردید نادرست است. لطفاً دوباره امتحان کنید."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2 که تایپ کردید نادرست است. لطفاً دوباره امتحان کنید."</string>
     <string name="badPin2" msgid="1041576234483629991">"پین 2 قدیمی که تایپ کردید نادرست است. لطفاً دوباره امتحان کنید."</string>
     <string name="mismatchPin2" msgid="523029155918113440">"کدهای پین 2 که تایپ کردید با هم مطابقت ندارند. دوباره امتحان کنید."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"یک کد پین 2، 4 تا 8 رقمی تایپ کنید."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"‏یک PUK2 دارای 8 رقم را تایپ کنید."</string>
+    <string name="invalidPuk2" msgid="1290977391033057871">"یک PUK2 دارای 8 رقم را تایپ کنید."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"پین 2 با موفقیت تغییر کرد."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"‏تایپ کد PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"گذرواژه نادرست بود، پین ۲ مسدود شد. لطفاً پین ۲ را تغییر دهید و دوباره امتحان کنید!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"‏گذرواژه نادرست است، سیم کارت قفل شد. PUK2 مورد نیاز است."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"‏PUK2 به صورت دائمی مسدود شده است."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> بار دیگر می‌توانید تلاش کنید."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"قفل پین ۲ گشوده شد!"</string>
+    <string name="label_puk2_code" msgid="302845876240219560">"تایپ کد PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"گذرواژه نادرست است، لطفاً پین 2 را تغییر داده و دوباره امتحان کنید!"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"گذرواژه نادرست است، سیم کارت قفل شد. PUK2 مورد نیاز است."</string>
     <string name="doneButton" msgid="2859593360997984240">"انجام شد"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"تماس کنفرانسی <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"شماره پست صوتی"</string>
@@ -409,7 +403,7 @@
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"شبکهٔ تلفن همراه موجود نیست."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"تماس ارسال نشد، هیچ شماره معتبری وارد نشده است."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"تماس ارسال نشد."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"‏شروع ترتیب MMI..."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"شروع ترتیب MMI..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"سرویس پشتیبانی نشده."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"تغییر وضعیت تماس‌ها امکان‌پذیر نیست."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"تفکیک تماس امکان‌پذیر نیست."</string>
@@ -442,13 +436,13 @@
     <string name="hac_mode_title" msgid="8740268574688743289">"دستگاه‌های کمک شنوایی"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"روشن کردن سازگاری دستگاه کمک شنوایی"</string>
   <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"‏TTY خاموش"</item>
-    <item msgid="3971695875449640648">"‏TTY پر است"</item>
+    <item msgid="512950011423868021">"TTY خاموش"</item>
+    <item msgid="3971695875449640648">"TTY پر است"</item>
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="dtmf_tones_title" msgid="5163153771291340803">"‏تون‌های DTMF"</string>
-    <string name="dtmf_tones_summary" msgid="3351820372864020331">"‏تنظیم طول آهنگ‌های DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"تون‌های DTMF"</string>
+    <string name="dtmf_tones_summary" msgid="3351820372864020331">"تنظیم طول آهنگ‌های DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"معمولی"</item>
     <item msgid="2883365539347850535">"طولانی"</item>
@@ -459,7 +453,7 @@
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"درحال فعال‌سازی…"</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"این تلفن در حال فعال کردن خدمات داده دستگاه همراه شما است.\n\nاین کار حداکثر ۵ دقیقه زمان می‌برد."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"از مرحله فعال سازی رد می‌شوید؟"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"‏در صورت رد شدن از مرحله فعال سازی، نمی‌توانید تماسی برقرار کنید یا به شبکه‌های داده‌ای تلفن همراه متصل شوید (با این وجود می‌توانید به شبکه‌های Wi-Fi متصل شوید). تا زمانی که گوشی خود را فعال نکنید، هر بار که تلفن را روشن می‌کنید از شما درخواست می‌شود آنرا فعال کنید."</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"در صورت رد شدن از مرحله فعال سازی، نمی‌توانید تماسی برقرار کنید یا به شبکه‌های داده‌ای تلفن همراه متصل شوید (با این وجود می‌توانید به شبکه‌های Wi-Fi متصل شوید). تا زمانی که گوشی خود را فعال نکنید، هر بار که تلفن را روشن می‌کنید از شما درخواست می‌شود آنرا فعال کنید."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"رد شدن"</string>
     <string name="ota_activate" msgid="1368528132525626264">"فعال کردن"</string>
     <string name="ota_title_activate_success" msgid="6570240212263372046">"تلفن فعال است."</string>
@@ -470,7 +464,7 @@
     <string name="ota_failure" msgid="4311299546379674378">"برنامه‌ریزی ناموفق"</string>
     <string name="ota_successful" msgid="1880780692887077407">"گوشی شما در حال حاضر فعال است. راه‌اندازی سرویس ممکن است ۱۵ دقیقه طول بکشد."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"تلفن شما فعال نشد. \nممکن است لازم باشد منطقه‌ای با پوشش بهتر (در نزدیکی پنجره، یا خارج از ساختمان) پیدا کنید. \n\nدوباره امتحان کنید یا برای اطلاع از گزینه‌های بیشتر، با سرویس مشتری تماس بگیرید."</string>
-    <string name="ota_spc_failure" msgid="3909983542575030796">"‏خطاهای SPC بسیار زیاد"</string>
+    <string name="ota_spc_failure" msgid="3909983542575030796">"خطاهای SPC بسیار زیاد"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"برگشت"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"دوباره امتحان کنید"</string>
     <string name="ota_next" msgid="3904945374358235910">"بعدی"</string>
@@ -497,19 +491,19 @@
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"رد کردن"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"سرویس"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"تنظیم"</string>
-    <string name="voicemail_number_not_set" msgid="6724904736891087856">"‏&lt;تنظیم نشده&gt;"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;تنظیم نشده&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"سایر تنظیمات تماس"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"تماس از طریق <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"عکس مخاطب"</string>
     <string name="goPrivate" msgid="865837794424530980">"برو به خصوصی"</string>
     <string name="selectContact" msgid="781975788478987237">"انتخاب حساب"</string>
     <string name="sip_settings" msgid="6699045718560859691">"تنظیمات تماس اینترنتی"</string>
-    <string name="sip_accounts" msgid="2097054001288457163">"‏حساب‌های تماس اینترنتی (SIP)"</string>
+    <string name="sip_accounts" msgid="2097054001288457163">"حساب‌های تماس اینترنتی (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"حساب‌ها"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"دریافت تماس‌های ورودی"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"عمر باتری را کاهش می‌دهد"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"استفاده از تماس اینترنتی"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"‏استفاده از تماس اینترنتی (فقط Wi-Fi)"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"استفاده از تماس اینترنتی (فقط Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"برای همه تماس‌ها وقتی شبکه داده در دسترس است"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"فقط برای تماس‌های اینترنتی"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"برای هر تماس سؤال شود"</string>
@@ -517,7 +511,7 @@
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"برقرار کردن تماس"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"استفاده از حساب تماس اینترنتی:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"همیشه برای برقراری تماس‌های اینترنتی استفاده شود"</string>
-    <string name="reset_my_choice_hint" msgid="5523030209803567922">"‏می‌توانید حساب تماس اینترنتی را که می‌خواهید به صورت پیش‌فرض استفاده کنید از تلفن &gt; تنظیمات &gt; تنظیمات تماس اینترنتی&gt; صفحه حساب‌ها، تغییر دهید."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"می‌توانید حساب تماس اینترنتی را که می‌خواهید به صورت پیش‌فرض استفاده کنید از تلفن &gt; تنظیمات &gt; تنظیمات تماس اینترنتی&gt; صفحه حساب‌ها، تغییر دهید."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"تماس با تلفن همراه"</string>
     <string name="internet_phone" msgid="1147922660195095810">"تماس اینترنتی"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"حساب تماس اینترنتی وجود ندارد"</string>
@@ -525,7 +519,7 @@
     <string name="sip_menu_add" msgid="8757508498518881500">"افزودن"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"افزودن حساب"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"حذف حساب"</string>
-    <string name="sip_account_list" msgid="5480058210652194306">"‏حساب‌های SIP"</string>
+    <string name="sip_account_list" msgid="5480058210652194306">"حساب‌های SIP"</string>
     <string name="saving_account" msgid="52903398217017954">"در حال ذخیره حساب..."</string>
     <string name="removing_account" msgid="7183999896088628100">"در حال حذف حساب..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"ذخیره"</string>
@@ -539,15 +533,15 @@
     <string name="registration_status_still_trying" msgid="3185581992666091911">"هنوز در حال تلاش..."</string>
     <string name="registration_status_not_receiving" msgid="4185572774980557758">"تماس‌های دریافتی موجود نیست."</string>
     <string name="registration_status_no_data" msgid="4901476962360656611">"ثبت حساب به دلیل عدم وجود اتصال اینترنتی متوقف شد."</string>
-    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"‏ثبت حساب به دلیل عدم وجود اتصال Wi-Fi متوقف شد."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"ثبت حساب به دلیل عدم وجود اتصال Wi-Fi متوقف شد."</string>
     <string name="registration_status_not_running" msgid="4824867184446232131">"ثبت حساب ناموفق بود."</string>
     <string name="registration_status_done" msgid="884630717456439280">"در حال دریافت تماس‌ها."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"ثبت حساب ناموفق بود: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)، بعداً امتحان می‌شود"</string>
     <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"ثبت حساب ناموفق بود: نام کاربری یا گذرواژه نادرست است."</string>
     <string name="registration_status_server_unreachable" msgid="5733421582468991276">"ثبت حساب ناموفق: نام سرور را بررسی کنید."</string>
     <string name="third_party_account_summary" msgid="2532526738862533028">"این حساب اکنون توسط برنامه <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> در حال استفاده است."</string>
-    <string name="sip_edit_title" msgid="489288416435014385">"‏جزئیات حساب SIP"</string>
-    <string name="sip_edit_new_title" msgid="3659149255856520385">"‏جزئیات حساب SIP"</string>
+    <string name="sip_edit_title" msgid="489288416435014385">"جزئیات حساب SIP"</string>
+    <string name="sip_edit_new_title" msgid="3659149255856520385">"جزئیات حساب SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"سرور"</string>
     <string name="username_title" msgid="2479375923477682328">"نام کاربری"</string>
     <string name="password_title" msgid="3323555249068171531">"رمز ورود"</string>
@@ -561,17 +555,17 @@
     <string name="advanced_settings" msgid="8350631795335495338">"تنظیمات اختیاری"</string>
     <string name="auth_username_title" msgid="851473016307947120">"نام کاربری تأیید اعتبار"</string>
     <string name="auth_username_summary" msgid="6782012405225938629">"نام کاربری مورد استفاده برای تأیید اعتبار"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"‏&lt;تنظیم نشده&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"‏&lt;مانند نام کاربری&gt;"</string>
-    <string name="optional_summary" msgid="1464058793789832411">"‏&lt;اختیاری&gt;"</string>
+    <string name="default_preference_summary" msgid="868766740121667450">"&lt;تنظیم نشده&gt;"</string>
+    <string name="display_name_summary" msgid="8636377460518225523">"&lt;مانند نام کاربری&gt;"</string>
+    <string name="optional_summary" msgid="1464058793789832411">"&lt;اختیاری&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ جهت نمایش همه لمس کنید"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ جهت پنهان کردن همه لمس کنید"</string>
     <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ضروری است و نباید خالی بماند."</string>
     <string name="not_a_valid_port" msgid="4796149266434630292">"شماره درگاه باید بین 1000 و 65534 باشد."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"اتصال اینترنتی وجود ندارد"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"‏اتصال Wi-Fi وجود ندارد"</string>
+    <string name="no_wifi_available_title" msgid="747881033089378758">"اتصال Wi-Fi وجود ندارد"</string>
     <string name="no_internet_available" msgid="7877142631803238549">"برای برقراری تماس اینترنتی، ابتدا اتصال اینترنت خود را بررسی کنید."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"‏برای تماس‌های اینترنتی باید به یک شبکه Wi-Fi وصل باشید (از تنظیمات بی‌سیم و شبکه استفاده کنید)."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"برای تماس‌های اینترنتی باید به یک شبکه Wi-Fi وصل باشید (از تنظیمات بی‌سیم و شبکه استفاده کنید)."</string>
     <string name="no_voip" msgid="8901474054537199865">"تماس اینترنتی پشتیبانی نمی‌شود"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"خودکار"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"همیشه ارسال شود"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c81233e..eceb7ec 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Valitse automaattisesti"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Valitse ensisijainen verkko automaattisesti"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automaattinen rekisteröinti..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Ensisijainen verkon tyyppi"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Verkkotila"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Vaihda verkon käyttötilaa"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ensisijainen verkon tyyppi"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Ensisijainen verkkotila"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Ensisijainen verkkotila: ensisijaisesti WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Ensisijainen verkkotila: vain GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Ensisijainen verkkotila: vain WCDMA"</string>
@@ -279,9 +279,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Useat luokat"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Useat luokat käytössä"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Useat luokat pois käytöstä"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (suositus)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (suositus)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Maailmanlaajuinen"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Valitse järjestelmä"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Vaihda CDMA-roaming-tila"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Valitse järjestelmä"</string>
@@ -302,7 +299,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivoi laite"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Määritä tiedonsiirtopalvelu"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Operaattorin asetukset"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Sallitut numerot"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Sallittujen numeroiden luettelo"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Sallittujen numeroiden käyttöönotto"</string>
@@ -341,7 +339,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Sallittuja numeroita ei päivitetty, koska annoit väärän PIN-koodin."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Sallittuja numeroita ei päivitetty, sillä numerossa voi olla enintään 20 merkkiä."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN-numeroa ei päivitetty. PIN2 on virheellinen tai puhelinnumero hylättiin."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN-toiminto epäonnistui."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Luetaan SIM-korttia…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM-kortilla ei ole yhteystietoja."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Valitse tuotavat yhteystiedot"</string>
@@ -362,7 +359,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM-kortin PIN-koodi pois käytöstä."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Annoit väärän PIN-koodin."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM-kortin PIN-koodin vaihtaminen onnistui."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Virheellinen salasana, PIN-koodi estetty! Pyydetään PUK-koodia."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Virheellinen salasana, SIM-kortti lukittu! Anna PUK2-koodi."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Vanha PIN2-koodi"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Uusi PIN2-koodi"</string>
@@ -374,11 +371,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Anna 8-numeroinen PUK2-koodi."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2-koodi vaihdettu."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Anna PUK2-koodi"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Virheellinen salasana, PIN2-koodi estetty. Vaihda PIN2-koodi ja yritä uudelleen."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Väärä salasana. Vaihda PIN2-koodi ja yritä uudelleen."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Virheellinen salasana, SIM-kortti lukittu. PUK2-koodi tarvitaan."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-koodi on pysyvästi estetty."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Sinulla on <xliff:g id="NUMBER">%d</xliff:g> yritystä jäljellä."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2-koodin esto kumottu!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Valmis"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Puhelinneuvottelu <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Puhelinvastaajan numero"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6ddcba4..282c325 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Sélectionner automatiquement"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Sélectionner automatiquement le réseau préféré"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Enregistrement automatique…"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Type de réseau préféré"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mode réseau"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Changer le mode de fonctionnement du réseau"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Type de réseau préféré"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mode réseau préféré"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Mode réseau préféré : WCDMA de préférence"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Mode réseau préféré : GSM uniquement"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Mode réseau préféré : WCDMA uniquement"</string>
@@ -279,9 +279,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-catégories"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Option \"Multi-catégories\" activée"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Option \"Multi-catégories\" désactivée"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recommandé)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recommandé)"</string>
-    <string name="network_global" msgid="1323190488685355309">"International"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sélection système"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Modifier le mode d\'itinérance CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sélection système"</string>
@@ -302,7 +299,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activer le périphérique"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurer le service de données"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Param. fourn. de services"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Numéros autorisés"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste de numéros autorisés"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activation des numéros autorisés"</string>
@@ -341,7 +339,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Le numéro autorisé n\'a pas été mis à jour, car vous avez saisi un NIP incorrect."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Le numéro autorisé n\'a pas été mis à jour, car il ne doit pas comporter plus de 20 chiffres."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Le numéro autorisé n\'a pas été mis à jour. Soit le NIP2 est incorrect, soit le numéro de téléphone a été rejeté."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Échec de l\'opération FDN."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lecture de la carte SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Aucun contact n\'a été trouvé sur votre carte SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Sélection des contacts à importer"</string>
@@ -362,7 +359,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"NIP de la carte SIM désactivé."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Le NIP saisi est incorrect."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Modification du NIP de la carte SIM réussie."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Mot de passe incorrect. Le NIP est bloqué. Le code PUK est nécessaire."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Mot de passe incorrect. La carte SIM est verrouillée! Clé PUK2 requise."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"NIP2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Ancien NIP2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nouveau NIP2"</string>
@@ -374,11 +371,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Saisissez une clé PUK2 à 8 chiffres."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Modification du NIP2 réussie."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Saisissez la clé PUK2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Le mot de passe est incorrect. Le NIP2 est bloqué. Veuillez modifier le NIP2, puis réessayer."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Le mot de passe est incorrect. Veuillez modifier le NIP2, puis réessayer."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Mot de passe incorrect. Carte SIM verrouillée. Clé PUK2 requise."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"Le code PUK2 est bloqué définitivement."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"NIP2 débloqué"</string>
     <string name="doneButton" msgid="2859593360997984240">"Terminé"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conférence téléphonique <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"N° messagerie vocale"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5cc7f32..dd5c6d8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Sélectionner automatiquement"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Sélectionner automatiquement le réseau préféré"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Enregistrement automatique…"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Type de réseau préféré"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mode réseau"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Changer le mode de fonctionnement du réseau"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Type de réseau préféré"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mode réseau préféré"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Mode réseau préféré : WCDMA de préférence"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Mode réseau préféré : GSM uniquement"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Mode réseau préféré : WCDMA uniquement"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-catégories"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Option \"Multi-catégories\" activée"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Option \"Multi-catégories\" désactivée"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recommandé)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recommandé)"</string>
-    <string name="network_global" msgid="1323190488685355309">"International"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sélection système"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Modifier le mode d\'itinérance CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sélection système"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activer le périphérique"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurer service données"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Paramètres de l\'opérateur"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Numéros autorisés"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste de numéros autorisés"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activation des numéros autorisés"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Le numéro autorisé n\'a pas été mis à jour, car vous avez saisi un code PIN incorrect."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Le numéro autorisé n\'a pas été mis à jour, car il ne doit pas comporter plus de 20 chiffres."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Le numéro autorisé n\'a pas été mis à jour. Soit le code PIN2 est incorrect, soit le numéro de téléphone a été rejeté."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Échec de l\'opération liée aux numéros autorisés."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lecture de la carte SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Aucun contact n\'a été trouvé sur votre carte SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Sélection des contacts à importer"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Code PIN de la carte SIM désactivé."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Le code PIN saisi est incorrect."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Modification du code PIN de la carte SIM réussie."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Mot de passe incorrect. Le code PIN est bloqué. Veuillez saisir la clé PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Mot de passe incorrect. La carte SIM est verrouillée ! Clé PUK2 requise."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Ancien code PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nouveau code PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Saisissez une clé PUK2 à 8 chiffres."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Modification du code PIN2 réussie."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Saisissez la clé PUK2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Le mot de passe est incorrect. Le code PIN2 est bloqué. Veuillez le modifier, puis réessayer."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Le mot de passe est incorrect. Veuillez modifier le code PIN2, puis réessayer."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Mot de passe incorrect. Carte SIM verrouillée. Clé PUK2 requise."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"La clé PUK2 est bloquée de manière définitive."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Code PIN2 débloqué."</string>
     <string name="doneButton" msgid="2859593360997984240">"OK"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conférence téléphonique à <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"N° messagerie vocale"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b7cc948..3ad4c37 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -103,7 +103,7 @@
     <string name="reverting_settings" msgid="4752151682666912828">"सेटिंग वापस ला रहा है..."</string>
     <string name="response_error" msgid="6674110501330139405">"नेटवर्क से अनपेक्षित प्रतिसाद."</string>
     <string name="exception_error" msgid="7027667130619518211">"नेटवर्क या सिम कार्ड त्रुटि."</string>
-    <string name="fdn_check_failure" msgid="18200614306525434">"आपके फ़ोन ऐप्स की फ़िक्‍स्‍ड डायलिंग नंबर सेटिंग चालू है. इसके परिणामस्‍वरूप, कॉल से संबंधित कुछ सुविधाएं कार्य नहीं कर रही हैं."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"आपके फ़ोन एप्‍स की फ़िक्‍स्‍ड डायलिंग नंबर सेटिंग चालू है. इसके परिणामस्‍वरूप, कॉल से संबंधित कुछ सुविधाएं कार्य नहीं कर रही हैं."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"इन सेटिंग को देखने के पहले रेडियो चालू करें."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ठीक है"</string>
     <string name="enable" msgid="1059008390636773574">"सक्षम करें"</string>
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"अपने आप चुनें"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"पसंदीदा नेटवर्क अपने आप चुनें"</string>
     <string name="register_automatically" msgid="6017849844573519637">"स्वचालित पंजीकरण..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"पसंदीदा नेटवर्क प्रकार"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"नेटवर्क मोड"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"नेटवर्क संचालन मोड बदलें"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"पसंदीदा नेटवर्क प्रकार"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"पसंदीदा नेटवर्क मोड"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"पसंदीदा नेटवर्क मोड: WCDMA को प्राथमिकता"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"पसंदीदा नेटवर्क मोड: केवल GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"पसंदीदा नेटवर्क मोड: केवल WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"बहु-श्रेणी"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"बहु-श्रेणी सक्षम की गई"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"बहु-श्रेणी अक्षम की गई"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (अनुशंसित)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (अनुशंसित)"</string>
-    <string name="network_global" msgid="1323190488685355309">"वैश्विक"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"सिस्टम चयन"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA रोमिंग मोड बदलें"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"सिस्टम चयन"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"उपकरण सक्रिय करें"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"डेटा सेवा सेट करें"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"वाहक सेटिंग"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"फ़िक्स्ड डायलिंग नंबर"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN सूची"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN सक्रियण"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN पे नई जानकारी नहीं है क्योंकि आपने गलत पिन लिखा है."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN पे नई जानकारी नहीं है क्योंकि नंबर में 20 से अधिक अंक नहीं हो सकते."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN पे नई जानकारी नहीं है. PIN2 गलत था, या फ़ोन नंबर अस्वीकृत था."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN की कार्यवाही विफल रही."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"सिम कार्ड से पढ़ रहा है…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"आपके सिम कार्ड पर कोई संपर्क नहीं है."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"आयात करने के लिए संपर्कों को चुनें"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"सिम पिन अक्षम"</string>
     <string name="pin_failed" msgid="2298841192582192277">"आपके द्वारा लिखा गया पिन गलत था."</string>
     <string name="pin_changed" msgid="4365538014588501049">"सिम पिन सफलतापूर्वक बदला गया."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"पासवर्ड गलत है, PIN अवरोधित किया गया! PUK का अनुरोध किया गया."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"पासवर्ड गलत, सिम लॉक की गई है! PUK2 का अनुरोध किया गया है."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"पिन2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"पुराना पिन2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"नया पिन2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"वह PUK2 टाइप करें जिसमें 8 नंबर हों."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"पिन2 सफलतापूर्वक बदला गया"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 कोड टाइप करें"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"पासवर्ड गलत है, PIN2 अवरोधित किया गया. कृपया PIN2 को बदलें और पुन: प्रयास करें!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"पासवर्ड गलत. पिन2 बदलें और पुनः प्रयास करें."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"पासवर्ड गलत है, सिम लॉक हो गया है. PUK2 का अनुरोध किया गया."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 स्थायी रूप से अवरोधित है."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> प्रयास शेष हैं."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 अनब्लॉक किया गया!"</string>
     <string name="doneButton" msgid="2859593360997984240">"पूर्ण"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"कॉन्फ़्रेंस कॉल <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ध्‍वनिमेल नबंर"</string>
@@ -483,8 +477,8 @@
     <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g> मिनट के लिए कोई डेटा कनेक्शन नहीं"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="8060210887681426682">"फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट के लिए आपातकालीन कॉलबैक मोड में रहेगा. हालांकि, इस मोड में होने पर डेटा कनेक्शन का उपयोग करने वाले किसी ऐप्स  का उपयोग नहीं किया जा सकता. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
-    <item quantity="other" msgid="8617116564023933114">"फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट के लिए आपातकालीन कॉलबैक मोड में रहेगा. हालांकि, इस मोड में होने पर डेटा कनेक्शन का उपयोग करने वाले किसी ऐप्स  का उपयोग नहीं किया जा सकता. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
+    <item quantity="one" msgid="8060210887681426682">"फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट के लिए आपातकालीन कॉलबैक मोड में रहेगा. हालांकि, इस मोड में होने पर डेटा कनेक्शन का उपयोग करने वाले किसी एप्स का उपयोग नहीं किया जा सकता. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
+    <item quantity="other" msgid="8617116564023933114">"फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट के लिए आपातकालीन कॉलबैक मोड में रहेगा. हालांकि, इस मोड में होने पर डेटा कनेक्शन का उपयोग करने वाले किसी एप्स का उपयोग नहीं किया जा सकता. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
     <item quantity="one" msgid="2585506997024726599">"आपातकालीन कॉलबैक मोड के समय चयनित क्रिया उपलब्ध नहीं है. फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट तक इस मोड में रहेगा. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
@@ -545,7 +539,7 @@
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"खाता पंजीकरण विफल: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); बाद में पुन: प्रयास किया जाएगा"</string>
     <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"खाता पंजीकरण विफल: गलत उपयोगकर्ता नाम या पासवर्ड."</string>
     <string name="registration_status_server_unreachable" msgid="5733421582468991276">"खाता पंजीकरण विफल: सर्वर नाम जांचें."</string>
-    <string name="third_party_account_summary" msgid="2532526738862533028">"वर्तमान में इस खाते का उपयोग <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ऐप्स  द्वारा किया जा रहा है."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"वर्तमान में इस खाते का उपयोग <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> एप्स द्वारा किया जा रहा है."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP खाता विवरण"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP खाता विवरण"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"सर्वर"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8144830..2613d10 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Odaberi automatski"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automatski odabir željene mreže"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatska prijava…"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Željena vrsta mreže"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Način mreže"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promijenite način rada mreže"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Željena vrsta mreže"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Način željene mreže"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Način željene mreže: Preferirano WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Način željene mreže: Samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Način željene mreže: Samo WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Višestruka kategorija"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Omogućena je višestruka kategorija"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Onemogućena je višestruka kategorija"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (preporučeno)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (preporučeno)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globalno"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Odabir sustava"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Promijeni način rada CDMA roaminga"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Odabir sustava"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivacija uređaja"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Postavljanje podatkovne usluge"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Postavke mobil. operatera"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Brojevi za fiksno biranje"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Popis FDN-a"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivacija FDN-a"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN nije ažuriran jer ste upisali pogrešan PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN nije ažuriran jer broj ne može premašivati 20 znamenki."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN nije ažuriran. PIN2 nije točan ili je telefonski broj odbijen."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operacija FDN nije uspjela."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čitanje sa SIM kartice…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nema kontakata na vašoj SIM kartici."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Odaberite kontakte za uvoz"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Onemogućen je PIN za SIM."</string>
     <string name="pin_failed" msgid="2298841192582192277">"PIN koji ste unijeli nije točan."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Uspješno je promijenjen PIN SIM-a."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Zaporka nije točna, PIN je blokiran! Potreban je PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Zaporka nije točna, SIM je zaključan! PUK2 zatražen."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Stari PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Novi PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Unesite PUK2 koji ima 8 brojeva."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 uspješno je promijenjen."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Unesite PUK2 kôd"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Zaporka nije točna, PIN2 je blokiran. Promijenite PIN2 i pokušajte ponovo!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Zaporka nije točna. Promijenite PIN2 i pokušajte ponovo."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Zaporka nije točna, SIM je zaključan. Zatražen je PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 je trajno blokiran."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Imate još ovoliko preostalih pokušaja: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 je deblokiran!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Gotovo"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferencijski poziv <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Broj govorne pošte"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9c7c2d4..38b1f50 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Automatikus választás"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Preferált hálózat automatikus kiválasztása"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatikus regisztráció..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferált hálózattípus"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Hálózati mód"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"A hálózati üzemmód megváltoztatása"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferált hálózattípus"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferált hálózati mód"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Preferált hálózati mód: preferált WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Preferált hálózati mód: csak GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Preferált hálózati mód: csak WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Több kategória"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Több kategória engedélyezve"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Több kategória letiltva"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (javasolt)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (javasolt)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globális"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Rendszer kiválasztása"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"A CDMA-barangolási mód megváltoztatása"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Rendszer kiválasztása"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Eszköz aktiválása"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Adatszolgáltatás beállítása"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Szolgáltatói beállítások"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Fix hívószámok"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN lista"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN aktiválása"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Az FDN nem volt frissítve, mert hibás PIN-kódot írt be."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Az FDN nem lett frissítve, mert a szám nem haladhatja meg a 20 számjegyet."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Az FDN nem lett frissítve. Hibás a PIN2 kód, vagy a telefonszámot elutasították."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Az FDN-művelet sikertelen."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Beolvasás a SIM-kártyáról..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nincsenek névjegyek a SIM-kártyán."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Válassza ki az importálni kívánt névjegyeket"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM kártya PIN kódja kikapcsolva."</string>
     <string name="pin_failed" msgid="2298841192582192277">"A megadott PIN kód hibás."</string>
     <string name="pin_changed" msgid="4365538014588501049">"A SIM kártya PIN kódja sikeresen módosítva."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"A jelszó helytelen, a PIN kód letiltva. Adja meg a PUK kódot."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"A jelszó helytelen, a SIM-kártya zárolásra került. Adja meg a PUK2-kódot."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Régi PIN2-kód"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Új PIN2-kód"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Írja be a 8 jegyű PUK2-kódot."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"A PIN2 kód sikeresen módosítva."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Írja be a PUK2-kódot"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"A jelszó helytelen, a PIN2 letiltva. Kérjük, módosítsa a PIN2 kódot, és próbálja újra."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"A jelszó helytelen. Kérjük, módosítsa a PIN2 kódot és próbálja újra."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"A jelszó helytelen, a SIM kártya zárolásra került. Adja meg a PUK2 kódot."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"A PUK2 végleg letiltva."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Még <xliff:g id="NUMBER">%d</xliff:g> próbálkozás maradt."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"A PIN2 letiltása feloldva."</string>
     <string name="doneButton" msgid="2859593360997984240">"Kész"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenciahívás: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Hangposta száma"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index aba1f02..551d1c1 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Ընտրել ավտոմատ"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Ավտոմատ ընտրել նախընտրելի ցանցը"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Ավտոմատ գրանցում..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Նախընտրելի ցանցի տեսակը"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Ցանցի ռեժիմը"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Փոխել ցանցային գործավար ռեժիմը"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Նախընտրելի ցանցի տեսակը"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Նախընտրելի ցանցի ռեժիմը"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Նախընտրելի ցանցի ռեժիմը՝ WCDMA նախընտրելի"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Նախընտրելի ցանցի ռեժիմը՝ միայն GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Նախընտրելի ցանցի ռեժիմը՝ միայն WCDMA"</string>
@@ -281,9 +281,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Բազմակարգ"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Բազմակարգը միացված է"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Բազմակարգն անջատված է"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (խորհուրդ է տրվում)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (խորհուրդ է տրվում)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Համակարգի ընտրություն"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Փոխել CDMA ռոումինգի ռեժիմը"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Համակարգի ընտրությում"</string>
@@ -304,7 +301,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ակտիվացնել սարքը"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Կարգավորել տվյալների ծառայությունը"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Օպերատորի կարգավորումներ"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Ամրակայված հեռախոսահամարներ"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ցուցակ"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN ակտիվացում"</string>
@@ -343,7 +341,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN-ը չի թարմացվել, քանի որ դուք մուտքագրել եք սխալ PIN:"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN-ը չի թարմացվել, քանի որ համարը չի կարող գերազանցել 20 նիշը:"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN-ը չի թարմացվել: PIN2-ը սխալ է կամ հեռախոսահամարը մերժված է:"</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN գործողությունը ձախողվեց:"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Ընթերցում է SIM քարտից..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Ձեր SIM քարտում կոնտակտներ չկան:"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Ընտրեք կոնտակտները ներմուծման համար"</string>
@@ -364,7 +361,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN-ն անջատված է:"</string>
     <string name="pin_failed" msgid="2298841192582192277">"Ձեր մուտքագրած PIN-ը սխալ է:"</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM-ի PIN-ը հաջողությամբ փոխվել է:"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Գաղտնաբառը սխալ է, PIN2-ը՝ արգելափակված: PUK-ն է պահանջվում:"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Գաղտնաբառը սխալ է, SIM-ը կողպված է: Պահանջվում է PUK2-ը:"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Հին PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Նոր PIN2"</string>
@@ -376,11 +373,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Մուտքագրեք PUK2-ը, որը 8 թիվ ունի:"</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2-ը հաջողությամբ փոխվել է:"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Մուտքագրել PUK2 կոդը"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Գաղտնաբառը սխալ է, PIN2-ը՝ արգելափակված: Խնդրում ենք փոխել PIN2-ն ու կրկին փորձել:"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Գաղտնաբառը սխալ է: Փոխեք PIN2-ն ու կրկին փորձեք:"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Գաղտնաբառը սխալ ՝, SIM-ը կողպված է: Պահանջվում է PUK2-ը:"</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-ն ընդմիշտ արգելափակված է:"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Մնաց <xliff:g id="NUMBER">%d</xliff:g> փորձ:"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2-ն արգելաբացվեց:"</string>
     <string name="doneButton" msgid="2859593360997984240">"Կատարված է"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Կոնֆերանս զանգ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Ձայնային փոստի համարը"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c98a310..9904a64 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Pilih otomatis"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Memilih jaringan yang disukai secara otomatis"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Pendaftaran otomatis..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Jenis jaringan yang dipilih"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mode Jaringan"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ubah mode pengoperasian jaringan"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Jenis jaringan yang dipilih"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mode jaringan yang disukai"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Mode jaringan pilihan: WCDMA lebih disukai"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Mode jaringan pilihan: GSM saja"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Mode jaringan pilihan: WCDMA saja"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-kategori"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multi-kategori diaktifkan"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multi-kategori dinonaktifkan"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (disarankan)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (disarankan)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Pilih sistem"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Ubah mode roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pilih sistem"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktifkan perangkat"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Siapkan layanan data"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Setelan operator"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Nomor Panggilan Tetap"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Daftar FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivasi FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN tidak diperbarui karena Anda memasukkan PIN yang salah."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN tidak diperbarui karena nomor tersebut tidak boleh melebihi 20 digit."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN tidak diperbarui. PIN2 salah, atau nomor telepon ditolak."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operasi FDN gagal."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Membaca dari kartu SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Tidak ada kontak pada Kartu SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Pilih kontak untuk diimpor"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN SIM dinonaktifkan."</string>
     <string name="pin_failed" msgid="2298841192582192277">"PIN yang Anda ketikkan salah."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN SIM berhasil diubah."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Sandi salah, PIN Diblokir! PUK diminta."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Sandi salah, SIM terkunci! Masukkan PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 yang lama"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 Baru"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Ketikkan PUK2 berupa 8 angka."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 berhasil diubah."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Ketikkan kode PUK2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Sandi salah, PIN2 Diblokir. Ubah PIN2 dan coba lagi!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Sandi salah. Ubah PIN2 dan coba lagi."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Sandi salah, SIM terkunci. Masukkan PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 diblokir selamanya."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Sisa <xliff:g id="NUMBER">%d</xliff:g> percobaan."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Blokir PIN2 Terbuka!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Selesai"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telewicara <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nomor kotak pesan"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b124757..98a7b9e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Scegli automaticamente"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Scegli automaticamente la rete preferita"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Registrazione automatica..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo di rete preferito"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modalità rete"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambia la modalità di funzionamento della rete"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo di rete preferito"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modalità di rete preferita"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modalità di rete preferita: WCDMA (preferita)"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modalità di rete preferita: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modalità di rete preferita: solo WCDMA"</string>
@@ -279,9 +279,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multicategoria"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multicategoria attivata"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multicategoria disattivata"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (opzione consigliata)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (opzione consigliata)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globale"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Selezione sistema"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Cambia la modalità roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selezione sistema"</string>
@@ -302,7 +299,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Attiva dispositivo"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Imposta servizio dati"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Impostazioni operatore"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Numeri selezione fissa (FDN)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Elenco FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Attivazione FDN"</string>
@@ -341,7 +339,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN non aggiornato perché il PIN inserito non è corretto."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN non è stato aggiornato perché il numero non può superare 20 cifre."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN non aggiornato. Il codice PIN2 non era corretto o il numero di telefono è stato rifiutato."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operazione FDN non riuscita."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lettura da SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nessun contatto presente nella SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleziona contatti da importare"</string>
@@ -362,7 +359,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN della SIM disattivato."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Il PIN digitato è errato."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN della SIM modificato."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Password errata, PIN bloccato. Occorre il PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Password errata. La SIM è bloccata. Inserisci il codice PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 attuale"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nuovo PIN2"</string>
@@ -374,11 +371,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Il PUK2 deve essere di 8 numeri."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 modificato."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Digita il codice PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Password errata, PIN2 bloccato. Modifica il PIN2 e riprova."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Password errata. Modifica il PIN2 e riprova."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Password errata. La SIM è bloccata. Inserisci il codice PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bloccato definitivamente."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Ancora <xliff:g id="NUMBER">%d</xliff:g> tentativi a disposizione."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 sbloccato."</string>
     <string name="doneButton" msgid="2859593360997984240">"Fine"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Audioconferenza <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numero segreteria"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8ef0f54..2cb95e2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -20,16 +20,16 @@
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"טלפון"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"חייגן חירום"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"טלפון"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"‏רשימת FDN"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"רשימת FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"לא ידוע"</string>
     <string name="private_num" msgid="6713286113000232309">"מספר פרטי"</string>
     <string name="payphone" msgid="1931775086311769314">"טלפון ציבורי"</string>
     <string name="onHold" msgid="9035493194749959955">"בהמתנה"</string>
-    <string name="mmiStarted" msgid="6347869857061147003">"‏קוד MMI הופעל"</string>
-    <string name="ussdRunning" msgid="485588686340541690">"‏קוד USSD פועל…"</string>
-    <string name="mmiCancelled" msgid="2771923949751842276">"‏קוד MMI מבוטל"</string>
+    <string name="mmiStarted" msgid="6347869857061147003">"קוד MMI הופעל"</string>
+    <string name="ussdRunning" msgid="485588686340541690">"קוד USSD פועל…"</string>
+    <string name="mmiCancelled" msgid="2771923949751842276">"קוד MMI מבוטל"</string>
     <string name="cancel" msgid="5044513931633602634">"ביטול"</string>
-    <string name="enter_input" msgid="1810529547726803893">"‏הודעת USSD חייבת להיות באורך של <xliff:g id="MIN_LEN">%d</xliff:g> עד <xliff:g id="MAX_LEN">%d</xliff:g> תווים. נסה שוב."</string>
+    <string name="enter_input" msgid="1810529547726803893">"הודעת USSD חייבת להיות באורך של <xliff:g id="MIN_LEN">%d</xliff:g> עד <xliff:g id="MAX_LEN">%d</xliff:g> תווים. נסה שוב."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"נהל שיחת ועידה"</string>
     <string name="ok" msgid="3811371167865772377">"אישור"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"רמקול"</string>
@@ -43,17 +43,17 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"לא"</string>
     <string name="wild_prompt_str" msgid="5543521676355533577">"החלף את התו הכללי ב"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"חסר מספר של דואר קולי"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"‏בכרטיס ה-SIM לא מאוחסן מספר של דואר קולי."</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"בכרטיס ה-SIM לא מאוחסן מספר של דואר קולי."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"הוסף מספר"</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"‏בוטלה החסימה של כרטיס SIM. מבטל את חסימת הטלפון..."</string>
-    <string name="label_ndp" msgid="780479633159517250">"‏PIN לביטול נעילה של רשת SIM"</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"בוטלה החסימה של כרטיס SIM. מבטל את חסימת הטלפון..."</string>
+    <string name="label_ndp" msgid="780479633159517250">"PIN לביטול נעילה של רשת SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"בטל נעילה"</string>
     <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"סגור"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"מבקש ביטול נעילת רשת..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"הבקשה לביטול נעילת הרשת נכשלה."</string>
     <string name="unlock_success" msgid="6770085622238180152">"ביטול נעילת הרשת התבצע בהצלחה."</string>
-    <string name="labelGSMMore" msgid="5930842194056092106">"‏הגדרות שיחה של GSM"</string>
-    <string name="labelCDMAMore" msgid="1630676740428229339">"‏הגדרות שיחה של CDMA"</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"הגדרות שיחה של GSM"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"הגדרות שיחה של CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"שמות של נקודות גישה"</string>
     <string name="settings_label" msgid="3876743539816984008">"הגדרות רשת"</string>
     <string name="voicemail" msgid="8693759337917898954">"דואר קולי"</string>
@@ -61,9 +61,9 @@
     <string name="networks" msgid="8873030692174541976">"מפעילי רשת"</string>
     <string name="call_settings" msgid="6112441768261754562">"הגדרות שיחה"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"הגדרות נוספות"</string>
-    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"‏הגדרות שיחה נוספות של GSM בלבד"</string>
-    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"‏הגדרות שיחה נוספות של CDMA"</string>
-    <string name="sum_cdma_call_settings" msgid="284753265979035549">"‏הגדרות שיחה נוספות של CDMA בלבד"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"הגדרות שיחה נוספות של GSM בלבד"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"הגדרות שיחה נוספות של CDMA"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"הגדרות שיחה נוספות של CDMA בלבד"</string>
     <string name="labelNwService" msgid="4699970172021870983">"הגדרות שירות רשת"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"זיהוי מתקשר"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"טוען הגדרות..."</string>
@@ -102,7 +102,7 @@
     <string name="updating_settings" msgid="8171225533884883252">"מעדכן הגדרות..."</string>
     <string name="reverting_settings" msgid="4752151682666912828">"מאחזר הגדרות הקודמות…"</string>
     <string name="response_error" msgid="6674110501330139405">"תגובה לא צפויה מהרשת."</string>
-    <string name="exception_error" msgid="7027667130619518211">"‏שגיאת רשת או שגיאה של כרטיס SIM."</string>
+    <string name="exception_error" msgid="7027667130619518211">"שגיאת רשת או שגיאה של כרטיס SIM."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"הגדרת מספרי החיוג הקבועים של אפליקציית הטלפון שלך מופעלת. כתוצאה מכך, חלק מהתכונות הקשורות לשיחות לא פועלות."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"הפעל את הרדיו לפני ההצגה של הגדרות אלה."</string>
     <string name="close_dialog" msgid="2365884406356986917">"אישור"</string>
@@ -128,7 +128,7 @@
     <string name="search_networks" msgid="1601136049300882441">"חפש רשתות"</string>
     <string name="network_query_error" msgid="6828516148953325006">"שגיאה במהלך חיפוש רשתות."</string>
     <string name="register_on_network" msgid="9055203954040805084">"נרשם ב-<xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="5613353860205691579">"‏כרטיס ה-SIM לא מאפשר חיבור לרשת זו."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"כרטיס ה-SIM לא מאפשר חיבור לרשת זו."</string>
     <string name="connect_later" msgid="2308119155752343975">"לא ניתן להתחבר לרשת זו כעת. נסה שוב מאוחר יותר."</string>
     <string name="registration_done" msgid="495135664535876612">"רשום ברשת."</string>
     <string name="sum_carrier_select" msgid="3494252551249882718">"בחר ספק רשת"</string>
@@ -136,23 +136,23 @@
     <string name="select_automatically" msgid="5628402124471810174">"בחר אוטומטית"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"בחר רשת מועדפת באופן אוטומטי"</string>
     <string name="register_automatically" msgid="6017849844573519637">"רישום אוטומטי..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"סוג רשת מועדף"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"מצב רשת"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"שנה את מצב ההפעלה של הרשת"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"סוג רשת מועדף"</string>
-    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"‏מצב רשת מועדפת: WCDMA מועדף"</string>
-    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"‏מצב רשת מועדפת: GSM בלבד"</string>
-    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"‏מצב רשת מועדפת: WCDMA בלבד"</string>
-    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"‏מצב רשת מועדפת: GSM / WCDMA"</string>
-    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"‏מצב רשת מועדפת: CDMA"</string>
-    <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_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_dialogtitle" msgid="8176355237105593793">"מצב רשת מועדפת"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"מצב רשת מועדפת: WCDMA מועדף"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"מצב רשת מועדפת: GSM בלבד"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"מצב רשת מועדפת: WCDMA בלבד"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"מצב רשת מועדפת: GSM / WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"מצב רשת מועדפת: CDMA"</string>
+    <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_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 name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"מצב רשת מועדף: LTE / WCDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -160,13 +160,13 @@
     <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>
+    <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>
@@ -175,8 +175,8 @@
     <string name="roaming_disable" msgid="1843417228755568110">"התחבר לשירותי נתונים בעת נדידה"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית כשהנדידה כבויה."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"לאפשר נדידת נתונים? אתה עלול לצבור חיובי נדידה משמעותיים!"</string>
-    <string name="gsm_umts_options" msgid="6538311689850981686">"‏אפשרויות GSM/UMTS"</string>
-    <string name="cdma_options" msgid="4016822858172249884">"‏אפשרויות CDMA"</string>
+    <string name="gsm_umts_options" msgid="6538311689850981686">"אפשרויות GSM/UMTS"</string>
+    <string name="cdma_options" msgid="4016822858172249884">"אפשרויות CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"שימוש בנתונים"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"נתונים שנעשה בהם שימוש בתקופה הנוכחית"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"תקופת השימוש בנתונים"</string>
@@ -184,15 +184,15 @@
     <string name="throttle_help" msgid="243651091785169900">"למידע נוסף"</string>
     <string name="throttle_status_subtext" msgid="1657318943142085170">"<xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>??) מתוך התקופה המרבית של <xliff:g id="USED_2">%3$s</xliff:g>\nהתקופה הבאה מתחילה בעוד <xliff:g id="USED_3">%4$d</xliff:g> ימים (<xliff:g id="USED_4">%5$s</xliff:g>)"</string>
     <string name="throttle_data_usage_subtext" msgid="6029276011123694701">"<xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>??)  מתוך התקופה המרבית של<xliff:g id="USED_2">%3$s</xliff:g>"</string>
-    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"‏<xliff:g id="USED_0">%1$s</xliff:g> חריגה מהמקסימום\nקצב הנתונים ירד ל-‏‎<xliff:g id="USED_1">%2$d</xliff:g> Kb לשנייה"</string>
+    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> חריגה מהמקסימום\nקצב הנתונים ירד ל-‏‎<xliff:g id="USED_1">%2$d</xliff:g> Kb לשנייה"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>?? מהמחזור חלפו\nהתקופה הבאה מתחילה בעוד <xliff:g id="USED_1">%2$d</xliff:g> ימים (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
-    <string name="throttle_rate_subtext" msgid="2149102656120726855">"‏קצב הנתונים יורד ל-‏‎<xliff:g id="USED">%1$d</xliff:g> Kb לשנייה במקרה של חריגה ממגבלת השימוש בנתונים"</string>
+    <string name="throttle_rate_subtext" msgid="2149102656120726855">"קצב הנתונים יורד ל-‏‎<xliff:g id="USED">%1$d</xliff:g> Kb לשנייה במקרה של חריגה ממגבלת השימוש בנתונים"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"למידע נוסף על מדיניות השימוש בנתונים ברשת הסלולרית של הספק שלך"</string>
-    <string name="cell_broadcast_sms" msgid="5584192824053625842">"‏SMS בשידור סלולרי"</string>
-    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"‏SMS בשידור סלולרי"</string>
-    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"‏SMS בשידור סלולרי מופעל"</string>
-    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"‏SMS בשידור סלולרי מושבת"</string>
-    <string name="cb_sms_settings" msgid="651715019785107312">"‏הגדרות SMS בשידור סלולרי"</string>
+    <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS בשידור סלולרי"</string>
+    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS בשידור סלולרי"</string>
+    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS בשידור סלולרי מופעל"</string>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"SMS בשידור סלולרי מושבת"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"הגדרות SMS בשידור סלולרי"</string>
     <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"שידור חירום"</string>
     <string name="emergency_broadcast_enable" msgid="2645980025414010211">"שידור חירום מופעל"</string>
     <string name="emergency_broadcast_disable" msgid="3665199821267569426">"שידור חירום מושבת"</string>
@@ -275,18 +275,15 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"ריבוי קטגוריות"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"ריבוי קטגוריות מופעל"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"ריבוי קטגוריות מושבת"</string>
-    <string name="network_lte" msgid="7702681952521375754">"‏LTE (מומלץ)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"‏4G (מומלץ)"</string>
-    <string name="network_global" msgid="1323190488685355309">"גלובלי"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"בחירת מערכת"</string>
-    <string name="cdma_system_select_summary" msgid="60460043745797517">"‏שנה את מצב נדידת CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"שנה את מצב נדידת CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"בחירת מערכת"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"בית בלבד"</item>
     <item msgid="1205664026446156265">"אוטומטי"</item>
   </string-array>
-    <string name="cdma_subscription_title" msgid="1162564010076763284">"‏הרשמה ל-CDMA"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"‏החלף בין RUIM/SIM ל-NV"</string>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"הרשמה ל-CDMA"</string>
+    <string name="cdma_subscription_summary" msgid="2530890766115781140">"החלף בין RUIM/SIM ל-NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"הרשמה"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
@@ -298,30 +295,31 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"הפעל מכשיר"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"הגדר שירות נתונים"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"הגדרות ספק"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"מספרי חיוג קבועים"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"‏רשימת FDN"</string>
-    <string name="fdn_activation" msgid="2156479741307463576">"‏הפעלת FDN"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"רשימת FDN"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"הפעלת FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"מספרי חיוג קבועים מופעלים"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"מספרי חיוג קבועים מושבתים"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"‏הפוך FDN לפעיל"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"‏השבת FDN"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"‏שנה PIN2"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"‏השבת FDN"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"‏הפוך FDN לפעיל"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"הפוך FDN לפעיל"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"השבת FDN"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"שנה PIN2"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"השבת FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"הפוך FDN לפעיל"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"נהל מספרי חיוג קבועים"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"‏שנה את ה-PIN לקבלת גישת FDN"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"שנה את ה-PIN לקבלת גישת FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"נהל רשימת מספרי טלפון"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"פרטיות קול"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"הפוך מצב פרטיות משופרת לפעיל"</string>
-    <string name="tty_mode_option_title" msgid="9033098925144434669">"‏מצב TTY"</string>
-    <string name="tty_mode_option_summary" msgid="1073835131534808732">"‏הגדר מצב TTY"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"מצב TTY"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"הגדר מצב TTY"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"ניסיון חוזר אוטומטי"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"אפשר מצב \'ניסיון חוזר\'."</string>
     <string name="menu_add" msgid="1882023737425114762">"הוסף איש קשר"</string>
     <string name="menu_edit" msgid="7143003705504672374">"ערוך איש קשר"</string>
     <string name="menu_delete" msgid="3977150783449642851">"מחק איש קשר"</string>
-    <string name="get_pin2" msgid="8204677063922225311">"‏הקלד PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"הקלד PIN2"</string>
     <string name="name" msgid="7329028332786872378">"שם"</string>
     <string name="number" msgid="7905950798349903858">"מספר"</string>
     <string name="save" msgid="4094274636321939086">"שמור"</string>
@@ -334,47 +332,43 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"מחק מספר חיוג קבוע"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"מוחק מספר חיוג קבוע..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"מספר חיוג קבוע נמחק."</string>
-    <string name="pin2_invalid" msgid="5470854099230755944">"‏ה-FDN לא עודכן כיוון שהקלדת PIN שגוי."</string>
-    <string name="fdn_invalid_number" msgid="1494755047900009147">"‏ה-FDN לא עודכן משום שהמספר חורג ממגבלת 20 הספרות."</string>
-    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"‏FDN לא עודכן. קוד PIN2 היה שגוי או שמספר הטלפון נדחה."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"‏פעולת FDN נכשלה."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"‏קורא מכרטיס SIM…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"‏אין אנשי קשר בכרטיס ה-SIM."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"ה-FDN לא עודכן כיוון שהקלדת PIN שגוי."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"ה-FDN לא עודכן משום שהמספר חורג ממגבלת 20 הספרות."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN לא עודכן. קוד PIN2 היה שגוי או שמספר הטלפון נדחה."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"קורא מכרטיס SIM…"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"אין אנשי קשר בכרטיס ה-SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"בחר אנשי קשר ליבוא"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"‏כדי לייבא אנשי קשר מכרטיס ה-SIM, כבה תחילה את מצב טיסה."</string>
-    <string name="enable_pin" msgid="5422767284133234860">"‏הפוך לפעיל/השבת PIN של SIM"</string>
-    <string name="change_pin" msgid="9174186126330785343">"‏שנה PIN של SIM"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"‏PIN של SIM:"</string>
-    <string name="oldPinLabel" msgid="5287773661246368314">"‏PIN ישן"</string>
-    <string name="newPinLabel" msgid="207488227285336897">"‏PIN חדש"</string>
-    <string name="confirmPinLabel" msgid="257597715098070206">"‏אשר PIN חדש"</string>
-    <string name="badPin" msgid="8955102849303984935">"‏ה-PIN הישן שהקלדת שגוי. נסה שוב."</string>
-    <string name="mismatchPin" msgid="5923253370683071889">"‏קודי ה-PIN שהקלדת אינם תואמים. נסה שוב."</string>
-    <string name="invalidPin" msgid="5981171102258684792">"‏הקלד PIN שאורכו 4 עד 8 ספרות."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"‏השבת PIN של SIM"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"‏הפוך PIN של SIM לפעיל"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"כדי לייבא אנשי קשר מכרטיס ה-SIM, כבה תחילה את מצב טיסה."</string>
+    <string name="enable_pin" msgid="5422767284133234860">"הפוך לפעיל/השבת PIN של SIM"</string>
+    <string name="change_pin" msgid="9174186126330785343">"שנה PIN של SIM"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"PIN של SIM:"</string>
+    <string name="oldPinLabel" msgid="5287773661246368314">"PIN ישן"</string>
+    <string name="newPinLabel" msgid="207488227285336897">"PIN חדש"</string>
+    <string name="confirmPinLabel" msgid="257597715098070206">"אשר PIN חדש"</string>
+    <string name="badPin" msgid="8955102849303984935">"ה-PIN הישן שהקלדת שגוי. נסה שוב."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"קודי ה-PIN שהקלדת אינם תואמים. נסה שוב."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"הקלד PIN שאורכו 4 עד 8 ספרות."</string>
+    <string name="disable_sim_pin" msgid="3992926931620188855">"השבת PIN של SIM"</string>
+    <string name="enable_sim_pin" msgid="5803702443844458831">"הפוך PIN של SIM לפעיל"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"נא המתן..."</string>
-    <string name="enable_pin_ok" msgid="9166061915030865848">"‏ה-PIN של ה-SIM מופעל."</string>
-    <string name="disable_pin_ok" msgid="5596999379593924850">"‏ה-PIN של ה-SIM הושבת."</string>
-    <string name="pin_failed" msgid="2298841192582192277">"‏ה-PIN שהקלדת היה שגוי."</string>
-    <string name="pin_changed" msgid="4365538014588501049">"‏ה-PIN של ה-SIM שונה בהצלחה."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"‏הסיסמה שגויה. מספר ה-PIN חסום. נשלחה בקשה לקוד PUK."</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"ה-PIN של ה-SIM מופעל."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"ה-PIN של ה-SIM הושבת."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"ה-PIN שהקלדת היה שגוי."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"ה-PIN של ה-SIM שונה בהצלחה."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"הסיסמה שגויה, ה-SIM נעול! דרוש PUK2‎."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"‏PIN2 ישן"</string>
-    <string name="newPin2Label" msgid="4573956902204349054">"‏PIN2 חדש"</string>
-    <string name="confirmPin2Label" msgid="8100319484454787708">"‏אשר PIN2 חדש"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"‏ה-PUK2 שהקלדת שגוי. נסה שוב."</string>
-    <string name="badPin2" msgid="1041576234483629991">"‏ה-PIN2 הישן שהקלדת שגוי. נסה שוב."</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"‏קודי ה-PIN2 שהקלדת אינם תואמים. נסה שוב."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"‏הקלד PIN2 שאורכו 4 עד 8 ספרות."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"‏הקלד PUK2 שאורכו 8 ספרות."</string>
-    <string name="pin2_changed" msgid="1639666438836544393">"‏ה-PIN2 שונה בהצלחה."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"‏הקלד קוד PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"‏הסיסמה שגויה. PIN2 חסום. שנה את קוד PIN2 ונסה שוב!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"‏הסיסמה שגויה, ה-SIM נעול. נדרש PUK2‎."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"‏PUK2 נחסם לצמיתות."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"נותרו <xliff:g id="NUMBER">%d</xliff:g> ניסיונות."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"‏נעילת PIN2 בוטלה!"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 ישן"</string>
+    <string name="newPin2Label" msgid="4573956902204349054">"PIN2 חדש"</string>
+    <string name="confirmPin2Label" msgid="8100319484454787708">"אשר PIN2 חדש"</string>
+    <string name="badPuk2" msgid="4851734468010000418">"ה-PUK2 שהקלדת שגוי. נסה שוב."</string>
+    <string name="badPin2" msgid="1041576234483629991">"ה-PIN2 הישן שהקלדת שגוי. נסה שוב."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"קודי ה-PIN2 שהקלדת אינם תואמים. נסה שוב."</string>
+    <string name="invalidPin2" msgid="8237110107480395938">"הקלד PIN2 שאורכו 4 עד 8 ספרות."</string>
+    <string name="invalidPuk2" msgid="1290977391033057871">"הקלד PUK2 שאורכו 8 ספרות."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"ה-PIN2 שונה בהצלחה."</string>
+    <string name="label_puk2_code" msgid="302845876240219560">"הקלד קוד PUK2"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"הסיסמה שגויה. שנה את ה-PIN2 ונסה שוב."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"הסיסמה שגויה, ה-SIM נעול. נדרש PUK2‎."</string>
     <string name="doneButton" msgid="2859593360997984240">"סיום"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"שיחת ועידה <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"המספר של הדואר הקולי"</string>
@@ -397,7 +391,7 @@
     <string name="notification_incoming_call" msgid="2820429205043529642">"שיחה נכנסת"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"דואר קולי חדש"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"דואר קולי חדש (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"‏חייג ‎<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>‎"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"חייג ‎<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>‎"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"המספר של הדואר הקולי אינו ידוע"</string>
     <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>
@@ -409,7 +403,7 @@
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"הרשת לנייד אינה זמינה."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"השיחה לא נשלחה, לא הוזן מספר חוקי."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"השיחה לא נשלחה."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"‏מתחיל רצף MMI…"</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"מתחיל רצף MMI…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"שירות לא נתמך."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"אין אפשרות להחליף שיחות."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"אין אפשרות להפריד את השיחה."</string>
@@ -437,18 +431,18 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"שיחת וידאו"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"ייבא"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"ייבא הכל"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"‏מייבא אנשי קשר מ-SIM"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"מייבא אנשי קשר מ-SIM"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"ייבא מאנשי קשר"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"מכשירי שמיעה"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"הפעל תאימות למכשיר שמיעה"</string>
   <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"‏TTY כבוי"</item>
-    <item msgid="3971695875449640648">"‏TTY מלא"</item>
+    <item msgid="512950011423868021">"TTY כבוי"</item>
+    <item msgid="3971695875449640648">"TTY מלא"</item>
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="dtmf_tones_title" msgid="5163153771291340803">"‏צלילי DTMF"</string>
-    <string name="dtmf_tones_summary" msgid="3351820372864020331">"‏הגדר את האורך של צלילי DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"צלילי DTMF"</string>
+    <string name="dtmf_tones_summary" msgid="3351820372864020331">"הגדר את האורך של צלילי DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"רגיל"</item>
     <item msgid="2883365539347850535">"ארוך"</item>
@@ -459,7 +453,7 @@
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"מפעיל..."</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"הטלפון מפעיל את שירותי הנתונים שלך לנייד.\n\nהתהליך עשוי לארוך עד 5 דקות."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"לדלג על ההפעלה?"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"‏אם תדלג על ההפעלה, לא תוכל להתקשר או להתחבר לרשתות נתונים לנייד (אך תוכל להתחבר לרשתות Wi-Fi). עד שתפעיל את הטלפון, תתבקש להפעיל אותו בכל פעם שתדליק אותו."</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"אם תדלג על ההפעלה, לא תוכל להתקשר או להתחבר לרשתות נתונים לנייד (אך תוכל להתחבר לרשתות Wi-Fi). עד שתפעיל את הטלפון, תתבקש להפעיל אותו בכל פעם שתדליק אותו."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"דלג"</string>
     <string name="ota_activate" msgid="1368528132525626264">"הפעל"</string>
     <string name="ota_title_activate_success" msgid="6570240212263372046">"הטלפון מופעל."</string>
@@ -470,7 +464,7 @@
     <string name="ota_failure" msgid="4311299546379674378">"התכנות נכשל"</string>
     <string name="ota_successful" msgid="1880780692887077407">"הטלפון שלך מופעל כעת. ייתכן שתמתין עד 15 דקות להפעלת השירות."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"הטלפון שלך לא הופעל. \nייתכן שעליך למצוא מקום שהקליטה בו טובה יותר (ליד חלון או בחוץ). \n\nנסה שוב או התקשר לשירות לקוחות לקבלת אפשרויות נוספות."</string>
-    <string name="ota_spc_failure" msgid="3909983542575030796">"‏כשלים מרובים של SPC"</string>
+    <string name="ota_spc_failure" msgid="3909983542575030796">"כשלים מרובים של SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"הקודם"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"נסה שוב"</string>
     <string name="ota_next" msgid="3904945374358235910">"הבא"</string>
@@ -497,19 +491,19 @@
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"סגור"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"שירות"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"הגדרות"</string>
-    <string name="voicemail_number_not_set" msgid="6724904736891087856">"‏&lt;לא הוגדר&gt;"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;לא הוגדר&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"הגדרות שיחה אחרות"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"שיחה באמצעות <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"תמונה של איש קשר"</string>
     <string name="goPrivate" msgid="865837794424530980">"עבור לשיחה פרטית"</string>
     <string name="selectContact" msgid="781975788478987237">"בחר איש קשר"</string>
     <string name="sip_settings" msgid="6699045718560859691">"הגדרות שיחת אינטרנט"</string>
-    <string name="sip_accounts" msgid="2097054001288457163">"‏חשבונות (SIP) להתקשרות באינטרנט"</string>
+    <string name="sip_accounts" msgid="2097054001288457163">"חשבונות (SIP) להתקשרות באינטרנט"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"חשבונות"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"קבל שיחות נכנסות"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"מקצר את חיי הסוללה"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"השתמש בהתקשרות באינטרנט"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"‏השתמש בהתקשרות באינטרנט (Wi-Fi בלבד)"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"השתמש בהתקשרות באינטרנט (Wi-Fi בלבד)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"לכל השיחות כאשר רשת הנתונים זמינה"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"לשיחות אינטרנט בלבד"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"שאל עבור כל שיחה"</string>
@@ -517,7 +511,7 @@
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"בצע שיחה"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"השתמש בחשבון להתקשרות באינטרנט:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"השתמש תמיד כדי לבצע שיחות אינטרנט"</string>
-    <string name="reset_my_choice_hint" msgid="5523030209803567922">"‏ניתן לשנות את חשבון השיחות באינטרנט לשימוש כברירת מחדל דרך \'טלפון\' &gt; \'הגדרות\' &gt; \'הגדרות שיחת אינטרנט\' &gt; \'חשבונות\'."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"ניתן לשנות את חשבון השיחות באינטרנט לשימוש כברירת מחדל דרך \'טלפון\' &gt; \'הגדרות\' &gt; \'הגדרות שיחת אינטרנט\' &gt; \'חשבונות\'."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"שיחה בטלפון סלולרי"</string>
     <string name="internet_phone" msgid="1147922660195095810">"שיחת אינטרנט"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"אין חשבון להתקשרות באינטרנט"</string>
@@ -525,7 +519,7 @@
     <string name="sip_menu_add" msgid="8757508498518881500">"הוסף"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"הוסף חשבון"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"הסר חשבון"</string>
-    <string name="sip_account_list" msgid="5480058210652194306">"‏חשבונות SIP"</string>
+    <string name="sip_account_list" msgid="5480058210652194306">"חשבונות SIP"</string>
     <string name="saving_account" msgid="52903398217017954">"שומר את החשבון..."</string>
     <string name="removing_account" msgid="7183999896088628100">"מסיר את החשבון..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"שמור"</string>
@@ -539,20 +533,20 @@
     <string name="registration_status_still_trying" msgid="3185581992666091911">"עדיין מנסה..."</string>
     <string name="registration_status_not_receiving" msgid="4185572774980557758">"לא מקבל שיחות."</string>
     <string name="registration_status_no_data" msgid="4901476962360656611">"רישום החשבון הופסק כיוון שאין חיבור לאינטרנט."</string>
-    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"‏רישום החשבון הופסק כיוון שאין חיבור Wi-Fi."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"רישום החשבון הופסק כיוון שאין חיבור Wi-Fi."</string>
     <string name="registration_status_not_running" msgid="4824867184446232131">"רישום החשבון נכשל."</string>
     <string name="registration_status_done" msgid="884630717456439280">"מקבל שיחות."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"הרשמת החשבון נכשלה: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); יתבצע ניסיון חוזר מאוחר יותר"</string>
     <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"רישום החשבון נכשל: שם המשתמש או הסיסמה שגויים."</string>
     <string name="registration_status_server_unreachable" msgid="5733421582468991276">"רישום החשבון נכשל: בדוק את שם השרת."</string>
     <string name="third_party_account_summary" msgid="2532526738862533028">"האפליקציה <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> משתמש כרגע בחשבון זה."</string>
-    <string name="sip_edit_title" msgid="489288416435014385">"‏פרטי חשבון SIP"</string>
-    <string name="sip_edit_new_title" msgid="3659149255856520385">"‏פרטי חשבון SIP"</string>
+    <string name="sip_edit_title" msgid="489288416435014385">"פרטי חשבון SIP"</string>
+    <string name="sip_edit_new_title" msgid="3659149255856520385">"פרטי חשבון SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"שרת"</string>
     <string name="username_title" msgid="2479375923477682328">"שם משתמש"</string>
     <string name="password_title" msgid="3323555249068171531">"סיסמה"</string>
     <string name="display_name_title" msgid="2459768196312249937">"שם תצוגה"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"‏כתובת שרת Proxy יוצא"</string>
+    <string name="proxy_address_title" msgid="4828301345351614273">"כתובת שרת Proxy יוצא"</string>
     <string name="port_title" msgid="5952939408078626657">"מספר יציאה"</string>
     <string name="transport_title" msgid="8253139511847746640">"סוג העברה"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"שלח אות חיבור"</string>
@@ -561,17 +555,17 @@
     <string name="advanced_settings" msgid="8350631795335495338">"הגדרות אופציונליות"</string>
     <string name="auth_username_title" msgid="851473016307947120">"שם משתמש לאימות"</string>
     <string name="auth_username_summary" msgid="6782012405225938629">"שם משתמש המשמש לאימות"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"‏&lt;לא הוגדר&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"‏&lt;זהה לשם משתמש&gt;"</string>
-    <string name="optional_summary" msgid="1464058793789832411">"‏&lt;אופציונלי&gt;"</string>
+    <string name="default_preference_summary" msgid="868766740121667450">"&lt;לא הוגדר&gt;"</string>
+    <string name="display_name_summary" msgid="8636377460518225523">"&lt;זהה לשם משתמש&gt;"</string>
+    <string name="optional_summary" msgid="1464058793789832411">"&lt;אופציונלי&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ גע כדי להציג את הכל"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ גע כדי להסתיר את הכל"</string>
     <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> הוא שדה חובה ולא ניתן להשאירו ריק."</string>
     <string name="not_a_valid_port" msgid="4796149266434630292">"מספר היציאה צריך להיות בין 1000 ל-65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"אין חיבור לאינטרנט"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"‏אין חיבור Wi-Fi"</string>
+    <string name="no_wifi_available_title" msgid="747881033089378758">"אין חיבור Wi-Fi"</string>
     <string name="no_internet_available" msgid="7877142631803238549">"כדי לבצע שיחת אינטרנט, בדוק תחילה את החיבור לאינטרנט."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"‏עליך להיות מחובר לרשת Wi-Fi כדי לבצע שיחות באינטרנט (השתמש בהגדרות \'אלחוטי ורשתות\')."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"עליך להיות מחובר לרשת Wi-Fi כדי לבצע שיחות באינטרנט (השתמש בהגדרות \'אלחוטי ורשתות\')."</string>
     <string name="no_voip" msgid="8901474054537199865">"אין תמיכה בהתקשרות באינטרנט"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"אוטומטי"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"שלח תמיד"</string>
@@ -604,7 +598,7 @@
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"רמקול מופעל."</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"שיחה מושתקת."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"ענה"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"‏שלח SMS"</string>
+    <string name="description_target_send_sms" msgid="2098326025587950144">"שלח SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"דחה"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"רטט"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"רטט"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1f46130..bfddae6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"自動的に選択"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"最適なネットワークを自動的に選択する"</string>
     <string name="register_automatically" msgid="6017849844573519637">"自動登録..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"優先ネットワークタイプ"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"ネットワークモード"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ネットワーク動作モードの変更"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"優先ネットワークタイプ"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"優先ネットワークモード"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"優先ネットワークモード: WCDMA優先"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"優先ネットワークモード: GSMのみ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"優先ネットワークモード: WCDMAのみ"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"複数カテゴリ"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"複数カテゴリは有効になっています"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"複数カテゴリは無効になっています"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE（推奨）"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G（推奨）"</string>
-    <string name="network_global" msgid="1323190488685355309">"グローバル"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"システムの選択"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMAローミングモードを変更する"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"システムの選択"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"端末を有効にする"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"データサービスの設定"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"携帯通信会社の設定"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"発信番号制限"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"発信番号制限リスト"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"発信番号制限の有効化"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"発信番号制限は更新されませんでした。入力したPINは正しくありません。"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"発信番号制限は更新されませんでした。20桁を超える番号は指定できません。"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"発信番号制限は更新されませんでした。PIN2が正しくないか、電話番号が拒否されました。"</string>
-    <string name="fdn_failed" msgid="540018079008319747">"発信番号制限操作に失敗しました。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIMカードから読み取り中..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIMカードに連絡先がありません。"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"インポートする連絡先の選択"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PINは無効です"</string>
     <string name="pin_failed" msgid="2298841192582192277">"入力したPINは正しくありませんでした。"</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM PINを変更しました。"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"パスワードが正しくありません。PINはブロックされています。PUKがリクエストされました。"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"パスワードが正しくありません。SIMがロックされています。PUK2を入力してください。"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"古いPIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"新しいPIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"8桁の数字のPUK2を入力してください。"</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2を変更しました。"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2コードを入力"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"パスワードが正しくありません。PIN2はブロックされています。PIN2を変更して再入力してください。"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"パスワードが正しくありません。PIN2を変更してもう一度お試しください。"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"パスワードが正しくありません。SIMはロックされています。PUK2を入力してください。"</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2は完全にブロックされています。"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"入力できるのはあと<xliff:g id="NUMBER">%d</xliff:g>回です。"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2のブロックが解除されました。"</string>
     <string name="doneButton" msgid="2859593360997984240">"完了"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"グループ通話 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ボイスメールの番号"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 06acc6b..35f5b73 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"ავტომატურად არჩევა"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"პრიორიტეტული ქსელის ავტომატური არჩევა"</string>
     <string name="register_automatically" msgid="6017849844573519637">"ავტომატური რეგისტრაცია…"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"ქსელის სასურველი ტიპი"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"ქსელის რეჟიმი"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ქსელის ოპერირების რეჟიმის შეცვლა"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ქსელის სასურველი ტიპი"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"სასურველი ქსელის რეჟიმი"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"ქსელის სასურველი რეჟიმი: WCDMA უპირატესობა"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"ქსელის სასურველი რეჟიმი: მხოლოდ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"ქსელის სასურველი რეჟიმი: WCDMA მხოლოდ"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"მრავალკატეგორიანი"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"მრავალი კატეგორია ჩართულია"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"მრავალი კატეგორია გამორთულია"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (რეკომენდებული)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (რეკომენდებული)"</string>
-    <string name="network_global" msgid="1323190488685355309">"გლობალური"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"სისტემის არჩევა"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA როუმინგის რეჟიმის შეცვლა"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"სისტემის არჩევა"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"მოწყობილობის აქტივაცია"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"მობილური ინტერნეტის სერვისის დაყენება"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"ოპერატორის პარამეტრები"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"დაშვებული ნომრები"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN სია"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN აქტივაცია"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN არ განახლდა, რადგან არასწორი PIN შეიყვანეთ."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ვერ განახლდა, რადგან ნომერი არ შეიძლება 20 ციფრს აღემატებოდეს."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN არ განახლდა. PIN2 არასწორია ან ტელეფონის ნომერი უარყოფილია."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN ოპერაცია ვერ განხორციელდა."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"მიმდინარეობს SIM ბარათიდან წაკითხვა…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"თქვენს SIM ბარათზე კონტაქტები არ არის."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"აირჩიეთ კონტაქტი იმპორტისათვის"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN გაუქმდა."</string>
     <string name="pin_failed" msgid="2298841192582192277">"შეყვანილი PIN არასწორია."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM PIN წარმატებით შეიცვალა."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"პაროლი არასწორია, PIN დაიბლოკა! მოთხოვნილია PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"პაროლი არასწორია, SIM ჩაკეტილია! მოთხოვნილია PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"ძველი PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"ახალი PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"აკრიფეთ PUK2, რომელიც 8 ციფრისგან შედგება."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 წარმატებით შეიცვალა."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"შეიყვანეთ PUK2 კოდი"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"პაროლი არასწორია, PIN2 დაიბლოკა. გთხოვთ, შეცვალოთ PIN2 და სცადოთ ისევ!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"პაროლი არასწორია. შეცვალეთ PIN2 და სცაეთ ისევ."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"პაროლი არასწორია, SIM ჩაკეტილია. მოთხოვნილია PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 სამუდამოდ დაიბლოკა."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"დარჩენილია <xliff:g id="NUMBER">%d</xliff:g> მცდელობა."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 განიბლოკა!"</string>
     <string name="doneButton" msgid="2859593360997984240">"დასრულდა"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"საკონფერენციო ზარი: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ხმოვანი ფოსტის ნომერი"</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 0e62e2d..8630039 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"ជ្រើស​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"ជ្រើស​បណ្ដាញ​ដែល​ចូលចិត្ត​ដោយ​ស្វ័យប្រវត្តិ"</string>
     <string name="register_automatically" msgid="6017849844573519637">"ការ​ចុះ​ឈ្មោះ​ដោយ​ស្វ័យ​ប្រវត្តិ ..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"ប្រភេទ​បណ្ដាញ​​ដែល​​ពេញចិត្ត"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"របៀប​បណ្ដាញ"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ប្ដូរ​របៀប​ប្រតិបត្តិការ​បណ្ដាញ"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ប្រភេទ​បណ្ដាញ​​ដែល​​ពេញចិត្ត"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"របៀប​បណ្ដាញ​ដែល​ចូលចិត្ត"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"របៀប​បណ្ដាញ​ដែល​ចូលចិត្ត៖ WCDMA ដែល​ចូលចិត្ត"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"របៀប​បណ្ដាញ​ដែល​ចូលចិត្ត៖ តែ GSM ប៉ុណ្ណោះ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"របៀប​បណ្ដាញ​ដែល​ចូលចិត្ត៖ តែ  WCDMA ប៉ុណ្ណោះ"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"ប្រភេទ​ច្រើន"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"បាន​បើក​ប្រភេទ​ច្រើន"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"បាន​បិទ​ប្រភេទ​ច្រើន"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (បាន​ផ្ដល់​អនុសាសន៍)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (បាន​ផ្ដល់​អនុសាសន៍)"</string>
-    <string name="network_global" msgid="1323190488685355309">"សកល"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"ជ្រើស​ប្រព័ន្ធ"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"ប្ដូរ​របៀប​រ៉ូមីង CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"ជ្រើស​ប្រព័ន្ធ"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"ធ្វើ​ឲ្យ​​​ឧបករណ៍​​​សកម្ម"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"រៀបចំ​សេវា​​កម្ម​ទិន្នន័យ"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"ការ​កំណត់​ក្រុមហ៊ុន​បញ្ជូន"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"លេខ​ហៅ​ថេរ"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"បញ្ជី FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"ការ​ធ្វើ​ឲ្យ​សកម្ម FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"មិន​បាន​ធ្វើ​បច្ចុប្បន្នភាព FDN ពី​ព្រោះ​អ្នក​បាន​វាយ​បញ្ចូល​កូដ PIN មិន​ត្រឹមត្រូវ។"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"មិន​​បាន​ធ្វើ​បច្ចុប្បន្នភាព FDN ពីព្រោះ​ចំនួន​មិន​អាច​លើស​ពី ២០ តួ​លេខ​​ទេ។"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"មិន​បាន​ធ្វើ​បច្ចុប្បន្នភាព។ កូដ PIN2 មិន​ត្រឹមត្រូវ ឬ​លេខ​ទូរស័ព្ទ​ត្រូវ​បាន​ច្រានចោល។"</string>
-    <string name="fdn_failed" msgid="540018079008319747">"បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិការ FDN ។"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"កំពុង​អាន​ពី​ស៊ីមកាត…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"គ្មាន​ទំនាក់ទំនង​នៅ​លើ​ស៊ីមកាត​របស់​អ្នក​ទេ។"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"ជ្រើស​ទំនាក់​ទំនង​ដើម្បី​នាំចូល"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"បាន​បិទ​កូដ PIN ស៊ីមកាត។"</string>
     <string name="pin_failed" msgid="2298841192582192277">"អ្នក​បាន​វាយ​​បញ្ចូល​កូដ PIN មិន​ត្រឹមត្រូវ។"</string>
     <string name="pin_changed" msgid="4365538014588501049">"បាន​ប្ដូរ​កូដ PIN ស៊ីមកាត​ដោយ​ជោគជ័យ។"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​, បាន​ទប់ស្កាត់​​លេខ​កូដ PIN​! បាន​ស្នើ​លេខ​កូដ PUK ​។"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ  បាន​ចាក់សោ​ស៊ីមកាត! បាន​ស្នើ​កូដ PUK2 ​។"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"កូដ PIN2 ចាស់"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"កូដ PIN2 ថ្មី"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"​វាយ​បញ្ចូល​កូដ PUK2 ដែល​មាន​ចំនួន ៨ ខ្ទង់ ​។"</string>
     <string name="pin2_changed" msgid="1639666438836544393">"បាន​ប្ដូរ​កូដ PIN2 ដោយ​ជោគជ័យ។"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"វាយ​បញ្ចូល​កូដ PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​,​បាន​ទប់ស្កាត់​លេខ​កូដ PIN2 ​។ សូម​​ប្ដូរ​​លេខ​កូដ PIN2 ហើយ​​ព្យាយាម​ម្ដង​ទៀត​!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ។ ប្ដូរ​កូដ PIN2 ហើយ​ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ​  បាន​ចាក់សោ​ស៊ីមកាត។ បាន​ស្នើ​កូដ PUK2 ​។"</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"លេខ​កូដ PUK2 ត្រូវ​បាន​​ទប់ស្កាត់​ជា​អចិន្ត្រៃយ៍។"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n" មាន <xliff:g id="NUMBER">%d</xliff:g> ការ​ព្យាយាម​ដែល​នៅ​សល់​។"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"មិន​បាន​​ទប់ស្កាត់​​លេខ​កូដ​ PIN2 !"</string>
     <string name="doneButton" msgid="2859593360997984240">"រួចរាល់"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"ការ​ហៅ​ជា​សន្និសីទ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"លេខ​សារ​ជា​សំឡេង"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 16be2b5..35b7c26 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"자동으로 선택"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"기본 설정 네트워크를 자동으로 선택"</string>
     <string name="register_automatically" msgid="6017849844573519637">"자동 등록..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"기본 네트워크 유형"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"네트워크 모드"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"네트워크 작동 모드 변경"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"기본 네트워크 유형"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"기본 설정된 네트워크 모드"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"기본 네트워크 모드: WCDMA 선호"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"기본 네트워크 모드: GSM 전용"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"기본 네트워크 모드: WCDMA 전용"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"다중 카테고리"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"다중 카테고리 사용"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"다중 카테고리 사용 중지"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE(권장)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G(권장)"</string>
-    <string name="network_global" msgid="1323190488685355309">"전체"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"시스템 선택"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA 로밍 모드 변경"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"시스템 선택"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"기기 활성화"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"데이터 서비스 설정"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"이동통신사 설정"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"발신 허용 번호"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN 목록"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN 활성화"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"잘못된 PIN을 입력하여 FDN 업데이트 안됨"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"숫자가 20자리를 초과할 수 없으므로 FDN을 업데이트하지 못했습니다."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN이 업데이트되지 않았습니다. PIN2가 잘못되었거나 전화번호가 거부되었습니다."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN 작업이 실패했습니다."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM 카드에서 읽는 중..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM 카드에 주소록이 없습니다."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"가져올 주소록 선택"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN 사용 안함"</string>
     <string name="pin_failed" msgid="2298841192582192277">"입력한 PIN이 올바르지 않습니다."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM PIN이 변경되었습니다."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"비밀번호가 잘못되어 PIN이 차단되었습니다. PUK를 요청했습니다."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"비밀번호 틀림. SIM 잠겨 있음! PUK2 요청됨."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"이전 PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"새 PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"8자리 숫자로 된 PUK2를 입력하세요."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2가 변경되었습니다."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 코드 입력"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"비밀번호가 잘못되어 PIN2가 차단되었습니다. PIN2를 변경한 후 다시 시도하세요."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"비밀번호가 잘못되었습니다. PIN2를 변경한 후 다시 시도하세요."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"비밀번호 틀림. SIM 잠겨 있음. PUK2 요청한 상태임."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2가 완전히 차단되었습니다."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g>번의 기회가 남았습니다."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2이 차단 해제되었습니다."</string>
     <string name="doneButton" msgid="2859593360997984240">"완료"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"다자간 통화 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"음성사서함 번호"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 64330a5..684fe7f 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"ເລືອກອັດຕະໂນມັດ"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"ເລືອກເຄືອຂ່າຍທີ່ຕ້ອງການອັດຕະໂນມັດ"</string>
     <string name="register_automatically" msgid="6017849844573519637">"ການລົງທະບຽນອັດຕະໂນມັດ..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"ປະ​ເພດ​ເຄືອ​ຂ່າຍທີ່ຕ້ອງການ"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"ຮູບແບບເຄືອຂ່າຍ"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ປ່ຽນຮູບແບບປະຕິບັດການຂອງເຄືອຂ່າຍ"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ປະ​ເພດ​ເຄືອ​ຂ່າຍທີ່ຕ້ອງການ"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"ຮູບແບບເຄືອຂ່າຍທີ່ຕ້ອງການ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"ຮູບແບບເຄືອຂ່າຍທີ່ຕ້ອງການ: ຕ້ອງການ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"ຮູບແບບເຄືອຂ່າຍທີ່ຕ້ອງການ: GSM ເທົ່ານັ້ນ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"ຮູບແບບເຄືອຂ່າຍທີ່ຕ້ອງການ: WCDMA ເທົ່ານັ້ນ"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"ຫຼາຍໝວດໝູ່"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"ເປີດການນຳໃຊ້ຫຼາຍໝວດໝູ່ແລ້ວ"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"ປິດການນຳໃຊ້ຫຼາຍໝວດໝູ່ແລ້ວ"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (ແນະ​ນໍາ​)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (ແນະ​ນໍາ​)"</string>
-    <string name="network_global" msgid="1323190488685355309">"ທົ່ວໂລກ"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"ການເລືອກລະບົບ"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"ປ່ຽນຮູບແບບການໂຣມມິງ CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"ການເລືອກລະບົບ"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"ເປີດນຳໃຊ້ອຸປະກອນ"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ຕັ້ງຄ່າບໍລິການຂໍ້ມູນ"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"ການຕັ້ງຄ່າຜູ່ໃຫ້ບໍລິການ"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"ໝາຍເລກຈຳກັດການໂທອອກ"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"ລາຍ​ຊື່ FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"ການເປີດໃຊ້ FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN ບໍ່ໄດ້ອັບເດດເທື່ອ ເນື່ອງຈາກທ່ານໃສ່ລະຫັດ PIN ບໍ່ຖືກຕ້ອງ."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ບໍ່ໄດ້ອັບເດດເທື່ອ ເນື່ອງຈາກໂຕເລກບໍ່ສາມາດມີເກີນ 20​ ໂຕໄດ້."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN ບໍ່ໄດ້ອັບເດດເທື່ອ. ລະຫັດ PIN2 ບໍ່ຖືກຕ້ອງ ຫຼືເບີໂທລະສັບຖືກປະຕິເສດ."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN ເຮັດວຽກລົ້ມເຫຼວ!"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"ກຳລັງອ່ານຈາກ SIM card..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ໃນ SIM card ຂອງທ່ານ."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"ເລືອກລາຍຊື່ເພື່ອນຳເຂົ້າ"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN ຂອງ SIM ຖືກປິດແລ້ວ."</string>
     <string name="pin_failed" msgid="2298841192582192277">"ລະຫັດ PIN ທີ່ທ່ານພິມບໍ່ຖືກຕ້ອງ."</string>
     <string name="pin_changed" msgid="4365538014588501049">"ປ່ຽນລະຫັດ PIN ຂອງ SIM ສຳເລັດແລ້ວ."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ​, PIN ຖືກບລັອກ! ຕ້ອງໃຊ້ລະຫັດ PUK​​."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ, SIM ຖືກລັອກ! ຕ້ອງໃຊ້ລະຫັດ PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"ລະຫັດ PIN2 ເກົ່າ"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"ລະຫັດ PIN2 ໃໝ່"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"ພິມລະຫັດ PUK2 ທີ່ມີ 8 ໂຕເລກ."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"ປ່ຽນລະຫັດ PIN2 ສຳເລັດແລ້ວ."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"ພິມລະຫັດ PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ​, PIN2 ຖືກບລັອກ. ກະ​ລຸ​ນາ​​ປ່ຽນ​ PIN2 ແລະລອງໃໝ່ອີກ!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ. ກະລຸນາປ່ຽນລະຫັດ PIN2 ແລ້ວລອງໃໝ່."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"ລະຫັດຜ່ານບໍ່ຖືກຕ້ອງ, SIM ຖືກລັອກ. ຕ້ອງໃຊ້ລະຫັດ PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ຖືກບລັອກຢ່າງຖາວອນແລ້ວ."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"ທ່ານສາມາດລອງໄດ້ອີກ <xliff:g id="NUMBER">%d</xliff:g> ເທື່ອ."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 ຖືກປົດບລັອກແລ້ວ!"</string>
     <string name="doneButton" msgid="2859593360997984240">"ແລ້ວໆ"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"ປະຊຸມສາຍ <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ເບີຂໍ້ຄວາມສຽງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index cf61a4d..54411c1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -116,7 +116,7 @@
   </string-array>
     <string name="vm_changed" msgid="380744030726254139">"Pasikeitė balso pašto numeris."</string>
     <string name="vm_change_failed" msgid="3352934863246208918">"Balso pašto numerio pakeisti nepavyko.\nJei ši problema kartosis, kreipkitės į operatorių."</string>
-    <string name="fw_change_failed" msgid="5298103228470214665">"Peradresavimo numerio pakeisti nepavyko.\nJei ši problema kartosis, kreipkitės į operatorių."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Persiuntimo numerio pakeisti nepavyko.\nJei ši problema kartosis, kreipkitės į operatorių."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nepavyko pateikti ir išsaugoti dabartinio peradresavimo numerio nustatymų.\nVis tiek perjungti naują teikėją?"</string>
     <string name="no_change" msgid="3186040086622435212">"Neatlikta jokių pakeitimų."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Pasirinkti balso pašto paslaugą"</string>
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Pasirinkti automatiškai"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automatiškai pasirinkti pageidaujamą tinklą"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatinė registracija..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Pageidaujamas tinklo tipas"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Tinklo režimas"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Pakeisti tinklo veikimo režimą"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Pageidaujamas tinklo tipas"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Pageidaujamas tinklo režimas"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Pageidaujamas tinklo režimas: pageidautina WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Pageidaujamas tinklo režimas: tik GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Pageidaujamas tinklo režimas: tik WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Kelios kategorijos"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Įgalintos kelios kategorijos"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Išjungtos kelios kategorijos"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (rekomenduojamas)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (rekomenduojamas)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Visuotinis"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistemos pasirinkimas"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Pakeisti tarptinklinio CDMA ryšio režimą"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistemos pasirinkimas"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Suaktyvinti įrenginį"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nustatyti duomenų paslaugą"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Operatoriaus nustatymai"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Fiksuoto rinkimo numeriai"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN sąrašas"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN aktyvinimas"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN neatnaujintas, nes įvedėte neteisingą PIN kodą."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN neatnaujintas, nes numerį gali sudaryti ne daugiau kaip 20 skaitmenų."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN nebuvo atnaujintas. Įvestas PIN2 kodas buvo netinkamas arba telefono numeris buvo atmestas."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Nepavyko atlikti FDN operacijos."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Skaitoma iš SIM kortelės..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kortelėje adresatų nėra."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Pasirinkti importuojamus adresatus"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM kortelės PIN kodas neleidžiamas."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Įvestas PIN kodas neteisingas."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM kortelės PIN kodas pakeistas sėkmingai."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Slaptažodis netinkamas, PIN kodas užblokuotas. Būtina įvesti PUK kodą."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Slaptažodis neteisingas, SIM kortelė užrakinta! Reikia PUK2 kodo."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Senas PIN2 kodas"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Naujas PIN2 kodas"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Įveskite 8 skaičių PUK2."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 kodas pakeistas sėkmingai."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Įveskite PUK2 kodą"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Netinkamas slaptažodis, PIN2 kodas užblokuotas. Pakeiskite PIN2 kodą ir bandykite iš naujo."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Neteisingas slaptažodis. Pakeiskite PIN2 kodą ir bandykite dar kartą."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Slaptažodis neteisingas, todėl SIM kortelė užrakinta. Būtina įvesti PUK2 kodą."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kodas visam laikui užblokuotas."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Liko <xliff:g id="NUMBER">%d</xliff:g> band."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 kodas atblokuotas."</string>
     <string name="doneButton" msgid="2859593360997984240">"Atlikta"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferencinis skambutis <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Balso pašto numeris"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 7661fcc..c0b5938 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Izvēlēties automātiski"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automātiski izvēlēties vajadzīgo tīklu"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automātiska reģistrācija..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Ieteicamais tīkla veids"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Tīkla režīms"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Mainiet tīkla darbības režīmu"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ieteicamais tīkla veids"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Vēlamais tīkla režīms"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Ieteicamais tīkla režīms: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Ieteicamais tīkla režīms: tikai GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Ieteicamais tīkla režīms: tikai WCDMA"</string>
@@ -277,9 +277,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Vairākas kategorijas"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Vairāku kategoriju režīms ir iespējots."</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Vairāku kategoriju režīms ir atspējots."</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (ieteicams)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (ieteicams)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Visā pasaulē"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistēmas atlasīšana"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Mainīt CDMA viesabonēšanas režīmu"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistēmas atlasīšana"</string>
@@ -300,7 +297,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ierīces aktivizēšana"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Datu pakalpojuma iestatīšana"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Operatora iestatījumi"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Fiksētie numuru sastādīšanas numuri"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FNSN saraksts"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FNSN aktivizācija"</string>
@@ -339,7 +337,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN nav atjaunināts, jo tika ievadīts nepareizs PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN netika atjaunināts, jo numurā nedrīkst būt vairāk par 20 cipariem."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN netika atjaunināts. Ievadītais PIN2 nebija pareizs, vai tālruņa numurs tika noraidīts."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FNSN ievadīšana neizdevās."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Notiek lasīšana no SIM kartes..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartē nav nevienas kontaktpersonas."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Importējamo kontaktpersonu atlasīšana"</string>
@@ -360,7 +357,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM kartes PIN ir atspējots."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Ievadītais PIN nav pareizs."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM kartes PIN ir veiksmīgi mainīts."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Parole nav pareiza, PIN kods ir bloķēts. Ievadiet PUK kodu."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Parole nav pareiza, SIM ir bloķēts. Ir jāievada PUK2 kods."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Iepriekšējais PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Jauns PIN2"</string>
@@ -372,11 +369,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Ierakstiet PUK2, kas sastāv no 8 cipariem."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 ir mainīts veiksmīgi."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Ierakstiet PUK2 kodu"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Parole nav pareiza, PIN2 kods ir bloķēts. Lūdzu, mainiet PIN2 kodu un mēģiniet vēlreiz!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Parole nav pareiza. Mainiet PIN2 un mēģiniet vēlreiz."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Parole nav pareiza, SIM karte ir bloķēta. Ir jāievada PUK2 kods."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kods ir neatgriezeniski bloķēts."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Varat mēģināt vēl <xliff:g id="NUMBER">%d</xliff:g> reizi(-es)."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 kods ir atbloķēts!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Gatavs"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferences zvans <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Balss pasta numurs"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 1db5232..998692e 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Автоматаар сонгох"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Давуу сүлжээг автоматаар сонгох"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Автомат бүртгэл…"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Сүлжээний үндсэн төрөл"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Сүлжээний төлөв"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Сүлжээний ажиллах төлвийг өөрчлөх"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Сүлжээний үндсэн төрөл"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Давуу сүлжээний төлөв"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Давуу сүлжээний төлөв: WCDMA давуутай"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Давуу сүлжээний төлөв: зөвхөн GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Давуу сүлжээний төлөв: зөвхөн WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Олон категори"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Олон-категори идэвхжсэн"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Олон-категори идэвхгүйжсэн"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (зөвлөмж болгосон)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (зөвлөмж болгосон)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Глобал"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Систем сонгох"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA роуминг төлвийг өөрчлөх"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Систем сонгох"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Төхөөрөмжийг идэвхжүүлэх"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Дата үйлчилгээний тохиргоо"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Операторын тохиргоо"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Тогтвортой Залгах Дугаар"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN жагсаалт"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN идэвхжүүлэлт"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Та буруу PIN оруулсан учир FDN шинэчлэгдсэнгүй."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Дугаар 20 цифрээс хэтрэх боломжгүй учир FDN шинэчлэгдээгүй."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN шинэчлэгдсэнгүй. PIN2 буруу байсан, эсхүл утасны дугаар зөвшөөрөгдсөнгүй."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"ФДН ажиллуулах амжилтгүй."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM картаас уншиж байна…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Таны SIM картанд харилцагчид байхгүй байна."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Оруулах харилцагчдыг сонгоно уу"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN идэвхгүйжсэн."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Таны оруулсан PIN буруу байсан."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM PIN амжилттай өөрчлөгдлөө."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Нууц үг буруу, ПИН түгжигдсэн! ПҮК оруулна уу."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Нууц үг буруу, SIM түгжигдсэн! PUK2 шаардлагатай."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Хуучин PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Шинэ PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"8 цифртэй PUK2 оруулна уу."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 амжилттай өөрчлөгдлөө."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 код оруулна уу"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Нууц үг буруу, ПИН2 Түгжигдсэн. ПИН2-г өөрчилсний дараа дахин оролдоно уу!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Нууц үг буруу байна. PIN2-г өөрчлөөд дахин оролдоно уу."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Нууц үг буруу, SIM түгжигдсэн. PUK2 шаардлагатай."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"ПҮК2 бүрмөсөн түгжигдсэн."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Одоо <xliff:g id="NUMBER">%d</xliff:g> оролдлого хийх боломж үлдлээ."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"ПИН2 Тайлагдсан!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Дууссан"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Утсан хурал <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Дуут шуудангийн дугаар"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index ec389ac..0574c89 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Pilih secara automatik"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Pilih rangkaian keutamaan secara automatik"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Pendaftaran automatik..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Jenis rangkaian pilihan"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mod Rangkaian"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Tukar mod pengendalian rangkaian"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Jenis rangkaian pilihan"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mod rangkaian diutamakan"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Mod rangkaian pilihan: WCDMA diutamakan"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Mod rangkaian pilihan: GSM sahaja"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Mod rangkaian pilihan: WCDMA sahaja"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Berbilang kategori"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Berbilang kategori didayakan"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Berbilang kategori dilumpuhkan"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (disyorkan)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (disyorkan)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Pilihan sistem"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Tukar mod perayauan CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pilihan sistem"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktifkan peranti"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Penyediaan perkhidmatan data"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Tetapan pembawa"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Nombor Dailan Tetap"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Senarai FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Pengaktifan FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN tidak dikemaskini kerana anda telah menaip PIN yang salah."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN tidak dikemas kini kerana nombor tidak boleh melebihi 20 digit."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN tidak dikemaskini. PIN2 salah atau nombor telefon telah ditolak."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operasi FDN gagal."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Membaca dari kad SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Tiada kenalan pada kad SIM anda."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Pilih kenalan untuk diimport"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN SIM dilumpuhkan."</string>
     <string name="pin_failed" msgid="2298841192582192277">"PIN yang anda taipkan adalah salah."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN SIM berjaya ditukar."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Kata laluan tidak betul, PIN Disekat! PUK diminta."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Kata laluan salah, SIM dikunci! PUK2 diminta."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 lama"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 baru"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Taipkan PUK2 yang mengandungi 8 nombor."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 berjaya ditukar."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Taipkan kod PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Kata laluan tidak betul, PIN2 Disekat. Sila tukar PIN2 dan cuba lagi!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Kata laluan tidak betul. Tukar PIN2 dan cuba lagi."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Kata laluan salah, SIM dikunci. PUK2 diminta."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 disekat secara kekal."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Masih ada <xliff:g id="NUMBER">%d</xliff:g> percubaan lagi."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 Dinyahsekat!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Selesai"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Panggilan sidang <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nombor mel suara"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f0d4bd1..babca5b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Velg automatisk"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Velg foretrukket nettverk automatisk"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Foretrukket nettverkstype"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Nettverksmodus"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Bytt nettverksmodus"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Foretrukket nettverkstype"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Foretrukket nettverksmodus"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Foretrukket nettverksmodus: WCDMA foretrekkes"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Foretrukket nettverksmodus: kun GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Foretrukket nettverksmodus: kun WCDMA"</string>
@@ -281,9 +281,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multikategori"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multikategori aktivert"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multikategori deaktivert"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (anbefales)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (anbefales)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Systemvalg"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Velg streifingsmodus for CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemvalg"</string>
@@ -304,7 +301,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktiver enhet"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Konfigurer datatjeneste"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Operatørinnstillinger"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Faste nummer"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste over faste nummer"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivering av faste nummer"</string>
@@ -343,7 +341,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN er ikke oppdatert fordi du skrev inn feil PIN-kode."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ble ikke oppdatert fordi tallet ikke kan overstige 20 sifre."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Fast nummer ble ikke oppdatert. PIN2 var feil, eller telefonnummeret ble avvist."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN-handlingen mislyktes."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leser fra SIM-kort…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Ingen kontakter på SIM-kortet."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Velg kontakter som skal importeres"</string>
@@ -364,7 +361,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Personlig kode for SIM-kort deaktivert."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Den personlige koden du skrev inn, er feil."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Personlig kode for SIM-kort er endret."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Feil passord – PIN-koden er sperret. PUK-kode forespurt."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Galt passord, SIM-kortet er låst! Skriv inn PUK2-koden."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2-kode"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Gammel PIN2-kode"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Ny PIN2-kode"</string>
@@ -376,11 +373,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Skriv inn en PUK2-kode som er 8 siffer."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Personlig kode (PIN2) er endret"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Skriv inn PUk2-kode"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Passordet er feil og PIN2 er sperret. Endre PIN2 og prøv på nytt."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Passordet er feil. Endre PIN2 og prøv på nytt."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Feil passord – SIM-kortet er låst. Bruk PUK2 for å låse opp."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 er permanent sperret."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Det er <xliff:g id="NUMBER">%d</xliff:g> forsøk igjen."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Sperring av PIN2 er opphevet"</string>
     <string name="doneButton" msgid="2859593360997984240">"Ferdig"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonmøte <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer til telefonsvarer"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 76cb546..99f9a4d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Automatisch kiezen"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Voorkeursnetwerk automatisch selecteren"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatische registratie..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Voorkeursnetwerktype"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Netwerkmodus"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"De netwerkgebruiksmodus wijzigen"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Voorkeursnetwerktype"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Voorkeursnetwerkmodus"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Voorkeursnetwerkmodus: voorkeur voor WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Voorkeursnetwerkmodus: alleen GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Voorkeursnetwerkmodus: alleen WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Meerdere categorieën"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Meerdere categorieën ingeschakeld"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Meerdere categorieën uitgeschakeld"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (aanbevolen)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (aanbevolen)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Algemeen"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Systeem selecteren"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"De CDMA-roamingmodus wijzigen"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systeem selecteren"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Apparaat activeren"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Gegevensservice instellen"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Providerinstellingen"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Vaste nummers"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-lijst"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-activering"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN is niet bijgewerkt omdat u een onjuiste pincode heeft ingevoerd."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN is niet bijgewerkt omdat het nummer niet langer kan zijn dan 20 tekens."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN is niet bijgewerkt. De PIN2 was onjuist of het telefoonnummer is geweigerd."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN-bewerking mislukt."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lezen vanaf SIM-kaart..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Geen contacten op uw SIM-kaart."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Contacten selecteren om te importeren"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Pincode voor simkaart uitgeschakeld."</string>
     <string name="pin_failed" msgid="2298841192582192277">"De pincode die u heeft ingevoerd, is onjuist."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Pincode voor simkaart gewijzigd."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Wachtwoord onjuist. Pincode geblokkeerd. Pukcode aangevraagd."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Wachtwoord onjuist, SIM-kaart is vergrendeld! PUK2-code vereist."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Oude PIN2-code"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nieuwe PIN2-code"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Voer een PUK2-code van 8 cijfers in."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2-code gewijzigd."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2-code invoeren"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Wachtwoord onjuist. PIN2-code geblokkeerd. Wijzig de PIN2-code en probeer het opnieuw."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Wachtwoord onjuist, wijzig de PIN2-code en probeer het opnieuw."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Wachtwoord onjuist, simkaart is vergrendeld. PUK2-code vereist."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-code is definitief geblokkeerd."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"U heeft nog <xliff:g id="NUMBER">%d</xliff:g> pogingen over."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Blokkering van PIN2-code opgeheven."</string>
     <string name="doneButton" msgid="2859593360997984240">"Gereed"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonische vergadering <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemailnummer"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index b4c49cf..cc7163e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Wybierz automatycznie"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automatycznie wybierz preferowaną sieć"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatyczna rejestracja..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferowany typ sieci"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Tryb sieci"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmień tryb działania sieci"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferowany typ sieci"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferowany tryb sieci"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Preferowany tryb sieci: preferowany WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Preferowany tryb sieci: tylko GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Preferowany tryb sieci: tylko WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Obsługa wielu kategorii"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Obsługa wielu kategorii włączona"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Obsługa wielu kategorii wyłączona"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (zalecana)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (zalecana)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globalna"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Wybór systemu"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Zmień tryb roamingu CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Wybór systemu"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktywuj urządzenie"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Skonfiguruj plan danych"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Ustawienia operatora"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Ustalone numery"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Ustalone numery"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktywacja usługi ustalonych numerów"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Nie zaktualizowano usługi FDN, ponieważ wpisano nieprawidłowy kod PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Nie zaktualizowano usługi FDN, ponieważ numer nie może być dłuższy niż 20 cyfr."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Nie zaktualizowano FDN. PIN2 był niepoprawny lub numer telefonu został odrzucony."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operacja FDN nie udała się."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Czytanie z karty SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Brak kontaktów na karcie SIM"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Wybierz kontakty do importowania"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN do karty SIM jest wyłączony."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Wpisany kod PIN był nieprawidłowy."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Kod PIN do karty SIM został zmieniony."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Nieprawidłowe hasło, PIN został zablokowany. Musisz podać PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Błędne hasło, karta SIM jest zablokowana! Wymagany kod PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Stary kod PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nowy PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Wprowadź 8-cyfrowy kod PUK2."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Kod PIN2 został pomyślnie zmieniony."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Wprowadź kod PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Nieprawidłowe hasło, PIN2 został zablokowany. Zmień PIN2 i spróbuj ponownie."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Błędne hasło. Zmień kod PIN2 i spróbuj ponownie."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Błędne hasło, karta SIM jest zablokowana. Wymagany kod PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 został trwale zablokowany."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Masz jeszcze <xliff:g id="NUMBER">%d</xliff:g> prób(y)."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 został odblokowany."</string>
     <string name="doneButton" msgid="2859593360997984240">"Gotowe"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Poł. konferencyjne <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numer poczty głosowej"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 022fe3b..050231e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Selecionar automaticamente"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Selecionar rede preferida automaticamente"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Registo automático..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de rede preferencial"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modo de rede"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de funcionamento em rede"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferencial"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modo de rede preferido"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modo de rede preferido: apenas WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modo de rede preferido: apenas GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modo de rede preferido: apenas WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Categoria múltipla"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Categoria múltipla activada"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Modo de categorias múltiplas desativado"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recomendado)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recomendado)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Seleccionar sistema"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Alterar o modo de roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Seleccionar sistema"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ativar dispositivo"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar serviço de dados"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Definições do operador"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Números de marcação fixa (FDN)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de números de marcação fixa (FDN)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activação de FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Os números autorizados não foram atualizados porque introduziu um PIN incorreto."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Os números autorizados não foram atualizados porque o número não pode exceder 20 dígitos."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Não foram atualizados os números autorizados. O PIN2 estava errado ou o número de telefone foi rejeitado."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Falha de FDN."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"A ler a partir do cartão SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Sem contactos no cartão SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccione os contactos a importar"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN do SIM desativado"</string>
     <string name="pin_failed" msgid="2298841192582192277">"O PIN introduzido não estava correto."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN do SIM alterado com sucesso"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Palavra-passe incorreta e PIN bloqueado! PUK solicitado."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Palavra-passe incorrecta, o cartão SIM está bloqueado! É necessário o PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antigo"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Novo PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Introduza um PUK2 com 8 números."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 alterado com sucesso."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Introduza o código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Palavra-passe incorreta e PIN2 bloqueado. Altere o PIN2 e tente novamente!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Palavra-passe incorreta. Altere o PIN2 e tente novamente!"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Palavra-passe incorreta, o SIM está bloqueado! É necessário o PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bloqueado permanentemente."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Restam <xliff:g id="NUMBER">%d</xliff:g> tentativas."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Concluído"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Chamada de conferência <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número do correio de voz"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 02e4acf..44c9179 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Escolher automaticamente"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Escolher automaticamente a rede preferencial"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Registro automático..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipo de rede preferencial"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modo de rede"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de operação de rede"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipo de rede preferencial"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modo de rede de preferência"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modo de rede preferencial: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modo de rede preferencial: somente GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modo de rede preferencial: somente WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Várias categorias"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Várias categorias ativadas"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Várias categorias desativadas"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recomendável)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recomendável)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Seleção de sistema"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Alterar o modo de roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selecionar sistema"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ativar aparelho"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar serviço de dados"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Config. da operadora"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Chamadas fixas"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Ativação do FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"O FDN não foi atualizado porque você digitou um PIN incorreto."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"O FDN não foi atualizado porque o número não pode exceder 20 dígitos."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"O FDN não foi atualizado. O PIN2 estava incorreto, ou o número de telefone foi rejeitado."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Falha na operação de FDN."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lendo a partir do cartão SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Não há contatos no seu cartão SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Selecione os contatos a serem importados"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN do SIM desativado."</string>
     <string name="pin_failed" msgid="2298841192582192277">"O PIN digitado estava incorreto."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN do SIM alterado."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Senha incorreta. PIN bloqueado. PUK solicitado."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Senha incorreta. SIM bloqueado! PUK2 solicitado."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antigo"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Novo PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Digite um PUK2 com 8 números."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 alterado."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Digitar o código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Senha incorreta. PIN2 bloqueado. Altere o PIN2 e tente novamente."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Senha incorreta. Altere o PIN2 e tente novamente."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Senha incorreta. SIM bloqueado. PUK2 solicitado."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 permanentemente bloqueado."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Tentativas restantes: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 desbloqueado."</string>
     <string name="doneButton" msgid="2859593360997984240">"Concluído"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conferência telefônica <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número correio de voz"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index eb55335..3e7a2d0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Selectaţi în mod automat"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Selectaţi în mod automat reţeaua preferată"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Înregistrare automată..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tipul de rețea preferat"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mod reţea"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Schimbaţi modul de operare a reţelei"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tipul de rețea preferat"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mod de reţea preferat"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Mod de reţea preferat: de preferat WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Mod de reţea preferat: numai GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Mod de reţea preferat: numai WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Categorii multiple"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Categorii multiple activate"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Categorii multiple dezactivate"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (recomandat)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (recomandat)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Global"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Selectaţi sistemul"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Schimbaţi modul de roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selectaţi sistemul"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activaţi dispozitivul"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configuraţi serviciul de date"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Setări operator"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Numere cu apelări restricţionate"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Listă FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activare FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN nu a fost actualizat, deoarece aţi introdus un cod PIN incorect."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN nu a fost actualizat, deoarece numărul nu poate depăşi 20 de cifre."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Numărul FDN nu a fost actualizat. Codul PIN2 a fost incorect sau numărul de telefon a fost respins."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operațiunea FDN nu a reușit."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Se citeşte de pe cardul SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nicio persoană în agenda de pe cardul dvs. SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Selectaţi persoanele din agendă care se importă"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Codul PIN al cardului SIM este dezactivat."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Codul PIN introdus a fost incorect."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Codul PIN pentru SIM a fost modificat."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Parolă incorectă, codul PIN a fost blocat! Se solicită codul PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Parolă incorectă, SIM blocat! Se solicită PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Codul PIN2 vechi"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Cod PIN2 nou"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Introduceţi un cod PUK2 format din 8 cifre."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Codul PIN2 a fost schimbat."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Introduceţi codul PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Parolă incorectă, codul PIN2 a fost blocat. Schimbați codul PIN2 și încercați din nou!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Parolă incorectă. Schimbaţi codul PIN2 şi încercaţi din nou."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Parolă incorectă, SIM blocat. Se solicită codul PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"Codul PUK2 este blocat definitiv."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Au mai rămas <xliff:g id="NUMBER">%d</xliff:g> încercări."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Codul PIN2 a fost deblocat!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Terminat"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Teleconferinţă <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Număr mesagerie vocală"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index af4d051..c9566a4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Автоматически"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Автоматически выбирать предпочтительную сеть"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Автоматическая регистрация..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Тип сети"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Режим сети"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Изменить режим работы сети"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Тип сети"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Режим предпочтительной сети"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Предпочтительная сеть: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Предпочтительная сеть: только GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Предпочтительная сеть: только WCDMA"</string>
@@ -277,9 +277,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Подборка из нескольких категорий"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Подборка из нескольких категорий включена"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Подборка из нескольких категорий отключена"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (рекомендуется)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (рекомендуется)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Все"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Выбор системы"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Изменить режим роуминга CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Выбор системы"</string>
@@ -300,7 +297,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активировать устройство"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Настроить передачу данных"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Настройки оператора"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Разрешенные номера"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Разрешенные номера"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Активация разреш. номеров"</string>
@@ -339,7 +337,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Разрешенный номер не обновлен, так как введен неверный PIN-код."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Разрешенный номер не обновлен, т. к. не может содержать более 20 цифр."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Список разрешенных номеров не обновлен. Указан неверный PIN2 или номер телефона."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Не удалось включить FDN"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Считывание с SIM-карты…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"На SIM-карте нет контактов."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Выберите контакты для импорта"</string>
@@ -360,7 +357,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Запрос PIN-кода SIM-карты отключен."</string>
     <string name="pin_failed" msgid="2298841192582192277">"PIN-код указан неверно."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN-код изменен."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Неверный пароль. PIN-код заблокирован. Отправлен запрос на получение PUK-кода."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Неверный пароль, SIM-карта заблокирована! Введите код PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Прежний PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Новый PIN2"</string>
@@ -372,11 +369,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Введите 8-значный код PUK2."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Код PIN2 изменен."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Введите код PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Неверный пароль. Код PIN2 заблокирован. Измените его и повторите попытку."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Неверный пароль. Измените код PIN2 и повторите попытку."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Неверный пароль, SIM-карта заблокирована. Введите код PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"Код PUK2 заблокирован навсегда"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Осталось попыток: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Код PIN2 разблокирован"</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференц-вызов: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер голосовой почты"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d295e6b..9753656 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Vybrať automaticky"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Automaticky vybrať preferovanú sieť"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatická registrácia..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Preferovaný typ siete"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Režim siete"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmeniť prevádzkový režim siete"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Preferovaný typ siete"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferovaný režim siete"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Preferovaný režim siete: preferované WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Preferovaný režim siete: iba GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Preferovaný režim siete: iba WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Viac kategórií"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Viac kategórií povolených"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Viacero kategórií zakázané"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (odporúčané)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (odporúčané)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globálne"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Výber systému"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Zmeniť režim roamingu CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Výber systému"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivovať zariadenie"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastaviť dátovú službu"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Nastavenia operátora"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Pevne určené čísla"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Zoznam pevne určených čísiel (FDN)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivácia pevne určených čísiel (FDN)"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Pevne určené čísla (FDN) neboli aktualizované, pretože ste zadali nesprávny kód PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Pevne určené čísla (FDN) neboli aktualizované, pretože číslo nesmie presiahnuť 20 číslic."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Pevne určené čísla (FDN) neboli aktualizované. Kód PIN2 bol nesprávny alebo bolo telefónne číslo odmietnuté."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operácia FDN zlyhala."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Prebieha čítanie z karty SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Na karte SIM nie sú žiadne kontakty."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Vybrať kontakty na import"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Kód PIN karty SIM je zakázaný."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Zadaný kód PIN je nesprávny."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Kód PIN karty SIM bol zmenený."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Chybné heslo, kód PIN bol zablokovaný! Vyžaduje sa kód PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Neplatné heslo, karta SIM je uzamknutá. Zadajte kód PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Pôvodný kód PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nový kód PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Zadajte 8-miestny kód PUK2."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Kód PIN2 bol zmenený."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Zadajte kód PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Chybné heslo, kód PIN2 bol zablokovaný. Zmeňte kód PIN2 a skúste to znova!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Heslo je nesprávne. Zmeňte kód PIN2 a skúste to znova."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Nesprávne heslo, karta SIM bola uzamknutá. Zadajte kód PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"Kód PUK2 je natrvalo blokovaný."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Počet zostávajúcich pokusov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Kód PIN2 bol odblokovaný!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Hotovo"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenčný hovor <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Číslo hlasovej schránky"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c2c455a..0c9739c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Samodejna izbira"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Samodejna izbira želenega omrežja"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Samodejna registracija ..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Prednostna vrsta omrežja"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Način omrežja"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Sprememba načina delovanja omrežja"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Prednostna vrsta omrežja"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Prednostni način omrežja"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Prednostni način omrežja: prednostno WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Prednostni način omrežja: samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Prednostni način omrežja: samo WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Več kategorij"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Omogočenih več kategorij"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Več kategorij onemogočenih"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (priporočeno)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (priporočeno)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globalno"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistemska izbira"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Spremeni način gostovanja CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistemska izbira"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Vklop naprave"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastavite podatkovni prenos"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Nastavitve operaterja"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Zapore odhodnih klicev"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Seznam FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktiviranje FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN ni bil posodobljen, ker ste vnesli napačno kodo PIN."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ni bil posodobljen, ker število ne sme presegati 20 mest."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN ni bil posodobljen. Koda PIN2 je bila napačna ali pa je bila telefonska številka zavrnjena."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Postopek za omejeno klicanje ni uspel."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Branje kartice SIM ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Na kartici SIM ni stikov."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Izberite stike, ki jih želite uvoziti"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN za kartico SIM onemogočen."</string>
     <string name="pin_failed" msgid="2298841192582192277">"PIN, ki ste ga vnesli, ni bil pravilen."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Sprememba kode PIN za kartico SIM je uspela."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Napačno geslo, koda PIN je blokirana. Vnesti morate kodo PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Nepravilno geslo, kartica SIM je zaklenjena. Vnesti morate kodo PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Stari PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Novi PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Vnesite osemmestno kodo PUK2."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Koda PIN2 je bila uspešno spremenjena."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Vnesite kodo PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Napačno geslo, koda PIN2 je blokirana. Spremenite kodo PIN2 in poskusite znova."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Napačno geslo. Spremenite PIN2 in poskusite znova."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Nepravilno geslo, kartica SIM je zaklenjena. Vnesti morate kodo PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"Koda PUK2 je trajno blokirana."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Poskusite lahko še <xliff:g id="NUMBER">%d</xliff:g>-krat."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Koda PIN2 je odblokirana."</string>
     <string name="doneButton" msgid="2859593360997984240">"Dokončano"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenčni klic <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Številka glasovne pošte"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2232303..04908b7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Изабери аутоматски"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Аутоматски избор жељене мреже"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Аутоматска регистрација..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Жељени тип мреже"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Режим мреже"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промена режима рада мреже"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Жељени тип мреже"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Жељени режим мреже"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Жељени режим мреже: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Жељени режим мреже: само GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Жељени режим мреже: само WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Више категорија"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Омогућено је више категорија"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Онемогућено је више категорија"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (препоручено)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (препоручено)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Глобално"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Избор система"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Промена режима CDMA роминга"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Избор система"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активирање уређаја"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Подесите усл. преноса података"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Подешавања оператера"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Фиксни бирани бројеви"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Листа бројева за фиксно бирање"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN активација"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Број за фиксно бирање није ажуриран јер сте унели нетачан PIN кôд."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Број за фиксно бирање није ажуриран јер број не сме да премашује 20 цифара."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN није ажуриран. PIN2 је нетачан или је број телефона одбачен."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Радња са бројем за фиксно бирање није успела."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Читање са SIM картице…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Нема контаката на SIM картици."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Избор контаката за увоз"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN кôд SIM картице је онемогућен."</string>
     <string name="pin_failed" msgid="2298841192582192277">"PIN кôд који сте унели је нетачан."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN кôд SIM картице је промењен."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Лозинка је нетачна. PIN је блокиран! Потребан је PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Лозинка је нетачна, SIM картица је закључана! Потребан је PUK2 кôд."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Стари PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Нови PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Унесите PUK2 који садржи 8 бројева."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 кôд је промењен."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Унесите PUK2 кôд"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Лозинка је нетачна. PIN2 је блокиран. Промените PIN2 и покушајте поново!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Лозинка је нетачна. Промените PIN2 кôд и покушајте поново."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Лозинка је нетачна, SIM картица је закључана. Потребан је PUK2 кôд."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 је трајно блокиран."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Имате још <xliff:g id="NUMBER">%d</xliff:g> покушаја."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 је деблокиран!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференцијски позив <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Број говорне поште"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 11f29ea..6bdff7a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Välj automatiskt"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Välj önskat nätverk automatiskt"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering ..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Önskad nätverkstyp"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Nätverksläge"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ändra nätverksläge"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Önskad nätverkstyp"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Föredraget nätverksläge"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Föredraget nätverksläge: Föredrar WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Föredraget nätverksläge: Endast GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Föredraget nätverksläge: Endast WCDMA"</string>
@@ -281,9 +281,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-kategori"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multikategori aktiverad"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multikategori inaktiverad"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (rekommenderas)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (rekommenderas)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Globalt"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Systemval"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Ändra CDMA-roamingläge"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemval"</string>
@@ -304,7 +301,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivera enhet"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ställ in datatjänst"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Operatörsinställningar"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Fasta nummer"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-lista"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-aktivering"</string>
@@ -343,7 +341,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN uppdaterades inte eftersom du skrev en felaktig PIN-kod."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN uppdaterades inte eftersom numret inte får ha mer än 20 siffror."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN uppdaterades inte. Antingen har du angivit fel PIN2, eller så avvisades telefonnumret."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Det gick inte att ringa till fast uppringningsnummer."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Läser från SIM-kort…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Inga kontakter på SIM-kortet."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Välj vilka kontakter som ska importeras"</string>
@@ -364,7 +361,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM-kortets PIN-kod är inaktiverad."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Du angav fel PIN-kod."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM-kortets PIN-kod har ändrats."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Felaktigt lösenord, pinkoden har blockerats. PUK-kod krävs."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Lösenordet är felaktigt och SIM-kortet har spärrats! PUK2 krävs."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Gammal PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Ny PIN2"</string>
@@ -376,11 +373,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Ange en PUK2-kod med 8 siffror."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 har ändrats."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Ange PUK2-kod"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Lösenordet är felaktigt. Pinkod 2 har blockerats. Ange en annan pinkod 2 och försök igen."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Lösenordet är felaktigt. Ange en annan PIN2-kod och försök igen."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Lösenordet är felaktigt och SIM-kortet har spärrats. PUK2 krävs."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK-kod 2 har blockerats permanent."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Du har <xliff:g id="NUMBER">%d</xliff:g> försök kvar."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Pinkod 2 har återaktiverats."</string>
     <string name="doneButton" msgid="2859593360997984240">"Färdig"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenssamtal <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer till röstbrevlåda"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 39be2f5..c468e43 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Chagua kiotomatiki"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Chagua mtandao unaoupendelea kiotomatiki"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Usajili otomatiki..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Aina ya mtandao unaopendekezwa"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Hali ya Mtandao"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Badilisha gumzo ya utendaji wa mtandao"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Aina ya mtandao unaopendekezwa"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"hali ya mtandao unaopendelewa"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modi pendekezwa ya mtandao: WCDMA pendekezwa"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modi pendekezwa ya mtandao: GSM  pekee"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modi pendekezwa ya mtandao: WCDMA pekee"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Kategoria anuwai"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Kategoria anuwai imewezeshwa"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Kategoria anuwai imelemazwa"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (inapendekezwa)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (inapendekezwa)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Ulimwenguni Kote"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Chagua mfumo"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Badilisha hali ya urandaji ya CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Chagua mfumo"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Wezesha kifaa"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Sanidi huduma ya data"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Mipangilio ya mtoa huduma"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Nambari za kupiga zisizobadilishwa"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Orodha ya FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Uwezeshaji wa FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN haikusasishwa kwa sababu uliweka PIN isiyo sahihi."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN haikusasishwa kwa sababu namba haiwezi kuzidisha herufi 20."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN haikusasishwa. PIN2 haikuwa sahihi, au namba ya simu ilikataliwa."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Utendakazi wa FDN ulishindwa."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Inasoma kutoka kwa SIM kadi…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Hakuna anwani kwenye SIM kadi yako."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Chagua anwani za kuingiza"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN ya SIM imelemazwa."</string>
     <string name="pin_failed" msgid="2298841192582192277">"PIN uliyochapa haikuwa sahihi."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Umefaulu kubadilisha PIN ya SIM."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Nenosiri lisilo sahihi, PIN Imezuiwa! PUK imeombwa."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Nenosiri sio sahihi, SIM imefungwa! PUK2 imeombwa."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Nenosiri la zamani"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nenosiri la 2 mpya"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Chapisha PUK2 ambayo ina namba 8."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 imefaulu kubadilishwa."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Andika msimbo wa PUK ya 2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Nenosiri lisilo sahihi, PIN2 Imezuiwa. Tafadhali badilisha PIN2 na ujaribu tena!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Nenosiri sio sahihi. Badilisha PIN2 na ujaribu tena."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Nenosiri sio sahihi, SIM imefungwa. PUK2 imeombwa."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 Imezuiwa kabisa."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Kuna majaribio <xliff:g id="NUMBER">%d</xliff:g> yaliyosalia."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 Imeondolewa kizuizi!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Kwisha"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Simu ya kongamano <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nambari ya ujumbe wa sauti"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8d89c83..74ff503 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"เลือกโดยอัตโนมัติ"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"เลือกเครือข่ายที่ต้องการอัตโนมัติ"</string>
     <string name="register_automatically" msgid="6017849844573519637">"การลงทะเบียนอัตโนมัติ..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"ประเภทเครือข่ายที่ต้องการ"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"โหมดเครือข่าย"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"เปลี่ยนโหมดปฏิบัติการของเครือข่าย"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"ประเภทเครือข่ายที่ต้องการ"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"โหมดเครือข่ายที่ต้องการ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"โหมดเครือข่ายที่ต้องการ: ต้องการ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"โหมดเครือข่ายที่ต้องการ: GSM เท่านั้น"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"โหมดเครือข่ายที่ต้องการ: WCDMA เท่านั้น"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"หลายหมวดหมู่"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"เปิดใช้งานหลายหมวดหมู่แล้ว"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"ปิดใช้งานหลายหมวดหมู่"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (แนะนำ)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (แนะนำ)"</string>
-    <string name="network_global" msgid="1323190488685355309">"ทั่วโลก"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"การเลือกระบบ"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"เปลี่ยนโหมดการเชื่อมต่อกับเครือข่าย CDMA อื่น"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"การเลือกระบบ"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"เปิดใช้งานอุปกรณ์"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ตั้งค่าบริการข้อมูล"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"การตั้งค่าของผู้ให้บริการ"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"การจำกัดหมายเลขโทรออก"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"รายการ FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"การเปิดใช้งาน FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN ไม่อัปเดตเพราะคุณป้อน PIN ไม่ถูกต้อง"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ไม่อัปเดตเพราะหมายเลขจะมีจำนวนเกิน 20 หลักไม่ได้"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"ไม่ได้อัปเดต FDN เพราะ PIN2 ไม่ถูกต้องหรือหมายเลขโทรศัพท์ถูกปฏิเสธ"</string>
-    <string name="fdn_failed" msgid="540018079008319747">"การปลดล็อกด้วย FDN ล้มเหลว"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"กำลังอ่านจากซิมการ์ด…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"ไม่มีที่อยู่ติดต่อบนซิมการ์ดของคุณ"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"เลือกสมุดโทรศัพท์ที่จะนำเข้า"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"ปิดใช้งาน PIN ของซิมแล้ว"</string>
     <string name="pin_failed" msgid="2298841192582192277">"PIN ที่คุณพิมพ์ไม่ถูกต้อง"</string>
     <string name="pin_changed" msgid="4365538014588501049">"เปลี่ยน PIN ของซิมสำเร็จแล้ว"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"รหัสผ่านไม่ถูกต้อง PIN ถูกบล็อก! ส่งคำขอ PUK แล้ว"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"รหัสผ่านไม่ถูกต้อง ซิมถูกล็อก! ขอ PUK2"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 เก่า"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 ใหม่"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"พิมพ์ PUK2 ซึ่งเป็นเลข 8 หลัก"</string>
     <string name="pin2_changed" msgid="1639666438836544393">"เปลี่ยน PIN2 เรียบร้อยแล้ว"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"พิมพ์รหัส PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"รหัสผ่านไม่ถูกต้อง PIN2 ถูกบล็อก โปรดเปลี่ยน PIN2 แล้วลองอีกครั้ง!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"รหัสผ่านไม่ถูกต้อง เปลี่ยน PIN2 แล้วลองอีกครั้ง"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"รหัสผ่านไม่ถูกต้อง ซิมถูกล็อก ขอ PUK2"</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ถูกบล็อกอย่างถาวร"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"พยายามได้อีก <xliff:g id="NUMBER">%d</xliff:g> ครั้ง"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"เลิกบล็อก PIN2 แล้ว!"</string>
     <string name="doneButton" msgid="2859593360997984240">"เสร็จสิ้น"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"การประชุมสาย <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"หมายเลขข้อความเสียง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0b26ee0..202b33a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Awtomatikong pumili"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Awtomatikong pumili ng ninanais na network"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Awtomatikong pagpaparehistro..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Gustong uri ng network"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Network Mode"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Baguhin ang network operating mode"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Gustong uri ng network"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Ninanais na network mode"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Mas gustong mode ng network: WCDMA ang mas gusto"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Mas gustong mode ng network: GSM lamang"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Mas gustong mode ng network: WCDMA lamang"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-category"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Pinagana ang multi-category"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Hindi pinagana ang multi-category"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (inirerekomenda)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (inirerekomenda)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Pandaigdigan"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Pagpili ng system"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Baguhin ang mode ng pag-roam ng CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pagpili ng system"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"I-activate ang device"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"I-set up ang serbisyo ng data"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Mga setting ng carrier"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Mga Fixed Dialing Number"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Listahan ng FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Pag-activate ng FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Hindi na-update ang FDN dahil maling PIN ang iyong na-type."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Hindi pa na-update ang FDN dahil hindi maaaring humigit sa 20 digit ang numero."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Hindi na-update ang FDN. Hindi wasto ang PIN2, o tinanggihan ang numero ng telepono."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Nagbigo ang operasyon ng FDN."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Nagbabasa mula sa SIM card…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Walang mga contact sa iyong SIM card."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Piliin ang mga contact upang i-import"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Hindi pinagana ang PIN ng SIM."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Mali ang na-type mong PIN."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Matagumpay na nabago ang PIN ng SIM."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Maling password, Na-block ang PIN! Hiniling ang PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Mali ang password, na-lock ang SIM! hinihiling ang PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Lumang PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Bagong PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Mag-type ng PUK2 na 8 numero."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Matagumpay na napalitan ang PIN2."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"I-type ang PUK2 code"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Maling password, Na-block ang PIN2. Pakibago ang PIN2 at subukang muli!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Mali ang password. Pakibago ang PIN2 at subukang muli."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Mali ang password, na-lock ang SIM. Hinihiling ang PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"Permanenteng na-block ang PUK2."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Mayroong <xliff:g id="NUMBER">%d</xliff:g> (na) natitirang pagsubok."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Na-unblock ang PIN2!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Tapos na"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conference na tawag <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numero ng voicemail"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1b90774..8d5efda 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Otomatik olarak seç"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Tercih edilen ağı otomatik olarak seç"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Otomatik kayıt..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tercih edilen ağ türü"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Ağ Modu"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ağın çalışma modunu değiştir"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tercih edilen ağ türü"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Tercih edilen ağ modu"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Tercih edilen ağ modu: WCDMA tercih edilir"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Tercih edilen ağ modu: Yalnızca GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Tercih edilen ağ modu: Yalnızca WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Çoklu kategori"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Çoklu kategori etkinleştirildi"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Çoklu kategori devre dışı bırakıldı"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (önerilir)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (önerilir)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Küresel"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistem seç"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA dolaşım modunu değiştir"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistem seçin"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Cihazı etkinleştir"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Veri hizmetini ayarla"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Operatör ayarları"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Sabit Arama Numaraları"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"SAN listesi"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"SAN etkinleştirme"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Yanlış PIN girdiğiniz için FDN güncellenmedi."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Sayı 20 basamaktan uzun olamayacağından FDN güncellenmedi."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN güncellenmedi. PIN2 doğru değildi veya telefon numarası reddedildi."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN işlemi başarısız oldu."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM karttan okunuyor..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartınızda hiçbir kişi yok."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"İçe aktarılacak kişileri seçin"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN kodu devre dışı."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Yazdığınız PIN hatalı."</string>
     <string name="pin_changed" msgid="4365538014588501049">"SIM PIN kodu başarıyla değiştirildi."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Şifre yanlış. PIN engellendi! PUK istendi."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Şifre hatalı, SIM kilitlendi! PUK2 isteniyor."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Eski PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Yeni PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"8 haneli bir PUK2 yazın."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2 başarıyla değiştirildi."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 kodunu yazın"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Şifre yanlış. PIN2 Engellendi. Lütfen PIN2\'yi değiştirin ve yeniden deneyin!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Şifre hatalı. PIN2 kodunu değiştirin ve tekrar deneyin."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Şifre hatalı, SIM kilitlendi! PUK2 isteniyor."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kalıcı olarak engellendi."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"<xliff:g id="NUMBER">%d</xliff:g> deneme hakkınız kaldı."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2\'nin Engellemesi Kaldırıldı!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Bitti"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferans görüşmesi <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Sesli mesaj numarası"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5d2c45a..1e40474 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Вибирати автоматично"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Автоматично вибирати основну мережу"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Автоматична реєстрація..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Тип мережі"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Режим мережі"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змінити режим роботи мережі"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Тип мережі"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Рекоменд. режим мережі"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Рекомендований режим мереж: бажано WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Рекомендований режим мереж: лише GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Рекомендований режим мереж: лише WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Мультикатегорія"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Мультикатегорію увімкн."</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Мультикатегорію вимкнено"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (рекомендується)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (рекомендується)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Усі"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Вибір системи"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Змінити режим CDMA-роумінгу"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Вибір системи"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активувати пристрій"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Налашт. службу пересил. даних"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Налаштування оператора"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Номери фіксованого набору"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Список FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Активація FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Фіксований номер (FDN) не оновлено, оскільки введено неправильний PIN-код."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Фіксований номер (FDN) не оновлено, оскільки кількість цифр не може перевищувати 20."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Фіксований номер (FDN) не оновлено. PIN2-код неправильний або номер телефону відхилено."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Помилка набору фіксованого номера."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Читання з SIM-карти…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"У SIM-карті немає контактів."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Виберіть контакти для імпорту"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"PIN-код SIM-карти вимкнено."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Введений PIN-код не правильний."</string>
     <string name="pin_changed" msgid="4365538014588501049">"PIN-код SIM-карти змінено."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Неправильний пароль. PIN-код заблоковано. Введіть PUK-код."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Пароль неправильний, SIM-картку заблок! Необх. PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Старий PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Новий PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Введіть PUK2 з 8 чисел."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"PIN2-код змінено."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Введіть PUK2-код"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Неправильний пароль. PIN2-код заблоковано. Змініть PIN2-код і повторіть спробу."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Пароль не правильний. Змініть PIN2-код і повторіть спробу."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Пароль не правильний. SIM-карту заблоковано. Потрібен PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-код назавжди заблоковано."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Залишилося стільки спроб: <xliff:g id="NUMBER">%d</xliff:g>."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2-код розблоковано."</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференц-виклик <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер голос. пошти"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 552cc54..e97ae1e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Tự động chọn"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Tự động chọn mạng ưa thích"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Đăng ký tự động..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Loại mạng ưa thích"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Chế độ Mạng"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Thay đổi chế độ hoạt động của mạng"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Loại mạng ưa thích"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Chế độ mạng được ưu thích"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Chế độ mạng được ưa thích: ưu tiên WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Chế độ mạng được ưa thích: chỉ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Chế độ mạng được ưa thích: chỉ WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Nhiều danh mục"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Đã bật nhiều danh mục"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Đã vô hiệu hóa nhiều danh mục"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (được khuyến nghị)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (được khuyến nghị)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Toàn cầu"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Chọn hệ thống"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Thay đổi chế độ chuyển vùng CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Chọn hệ thống"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Kích hoạt thiết bị"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Thiết lập dịch vụ dữ liệu"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Cài đặt nhà cung cấp dịch vụ"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Số Quay Định sẵn"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Danh sách FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Kích hoạt FDN"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN không được cập nhật do bạn đã nhập PIN không chính xác."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN chưa được cập nhật do số đã vượt quá 20 chữ số."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN không được cập nhật. Mã PIN2 không đúng hoặc số điện thoại đã bị từ chối."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Thao tác FDN không thành công."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Đang đọc từ thẻ SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Không có danh bạ trên thẻ SIM của bạn."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Chọn danh bạ để nhập"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"Đã tắt mã PIN của SIM."</string>
     <string name="pin_failed" msgid="2298841192582192277">"Mã PIN bạn đã nhập không chính xác."</string>
     <string name="pin_changed" msgid="4365538014588501049">"Mã PIN của SIM đã được thay đổi thành công."</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Mật khẩu không chính xác, mã PIN bị chặn! Yêu cầu mã PUK."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Mật khẩu không chính xác, SIM bị khóa! PUK2 được yêu cầu."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"Mã PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Mã PIN2 cũ"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Mã PIN2 Mới"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Nhập mã PUK2 có 8 số."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"Mã PIN2 đã được thay đổi thành công."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Nhập mã PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Mật khẩu không chính xác, mã PIN2 bị chặn. Vui lòng thay đổi mã PIN2 và thử lại!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Mật khẩu không chính xác. Hãy thay đổi mã PIN2 và thử lại."</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Mật khẩu không chính xác, SIM bị khóa. PUK2 được yêu cầu."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bị chặn vĩnh viễn."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Còn <xliff:g id="NUMBER">%d</xliff:g> lần thử."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"Đã bỏ chặn mã PIN2!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Xong"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Cuộc gọi hội nghị <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Số thư thoại"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2f77eb1..34a6037 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"自动选择"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"自动选择首选网络"</string>
     <string name="register_automatically" msgid="6017849844573519637">"自动注册..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"首选网络类型"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"网络模式"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"更改网络运行方式"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"首选网络类型"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"首选网络模式"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"首选网络模式：首选 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"首选网络模式：仅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"首选网络模式：仅限 WCDMA"</string>
@@ -275,9 +275,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"多类别"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"已启用多类别"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"已停用多类别"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE（建议）"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G（建议）"</string>
-    <string name="network_global" msgid="1323190488685355309">"通用"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"系统选择"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"更改 CDMA 漫游模式"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"系统选择"</string>
@@ -298,7 +295,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"激活设备"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"设置数据服务"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"运营商设置"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"固定拨号"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"固定拨号列表"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"激活固定拨号"</string>
@@ -337,7 +335,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"系统未更新 FDN，因为键入的 PIN 码有误。"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"系统未更新 FDN，因为号码不能超过 20 位。"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN 未更新。PIN2 有误，或电话号码遭拒。"</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN 操作失败。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"正在从 SIM 卡读取..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM 卡上无联系人。"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"选择要导入的联系人"</string>
@@ -358,7 +355,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"未启用 SIM 卡 PIN 码。"</string>
     <string name="pin_failed" msgid="2298841192582192277">"键入的 PIN 有误。"</string>
     <string name="pin_changed" msgid="4365538014588501049">"已成功更改 SIM 卡 PIN。"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"密码不正确，PIN 码已被锁定！请提供 PUK 码。"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"密码不正确，SIM 已锁定！需要 PUK2。"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"旧 PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"新 PIN2"</string>
@@ -370,11 +367,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"输入 8 位数字的 PUK2。"</string>
     <string name="pin2_changed" msgid="1639666438836544393">"已成功更改 PIN2。"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"输入 PUK2 码"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"密码不正确，PIN2码已被锁定。请更改PIN2码并重试！"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"密码有误，请更改 PIN2 并重试。"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"密码有误，SIM 卡已锁定。需要 PUK2。"</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2码已被永远锁定。"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"还有<xliff:g id="NUMBER">%d</xliff:g>次尝试机会。"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2码已解锁！"</string>
     <string name="doneButton" msgid="2859593360997984240">"完成"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"电话会议<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"语音信箱号码"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index bb2cc98..771adc4 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"自動選擇"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"自動選擇優先選用網絡"</string>
     <string name="register_automatically" msgid="6017849844573519637">"自動註冊..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"偏好的網絡類型"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"網絡模式"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"更改網絡操作模式"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"偏好的網絡類型"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"慣用網絡模式"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"慣用網絡模式：偏好 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"慣用網絡模式：僅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"慣用網絡模式：僅限 WCDMA"</string>
@@ -281,9 +281,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"多類別資訊"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"已啟用多類別資訊"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"多類別資訊已停用"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (建議)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (建議)"</string>
-    <string name="network_global" msgid="1323190488685355309">"通用"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"選取系統"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"更改 CDMA 漫遊模式"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"選取系統"</string>
@@ -304,7 +301,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"啟動裝置"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"設定數據傳輸服務"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"流動網絡供應商設定"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"固定撥號號碼"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN 清單"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN 啟用"</string>
@@ -343,7 +341,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"您所輸入的 PIN 碼不正確，FDN 未更新。"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"號碼超過 20 位數上限，FDN 未更新。"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN 無法更新。PIN2 碼不正確或電話號碼被拒。"</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN 操作失敗。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"正在從 SIM 卡讀取..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM 卡中沒有聯絡人。"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"選取要匯入的聯絡人"</string>
@@ -364,7 +361,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"已停用 SIM 卡 PIN 碼。"</string>
     <string name="pin_failed" msgid="2298841192582192277">"您所輸入的 PIN 碼不正確。"</string>
     <string name="pin_changed" msgid="4365538014588501049">"已成功更改 SIM 卡 PIN 碼。"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"密碼不正確，PIN 碼已被封鎖。請提供 PUK 碼。"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"密碼不正確，SIM 已鎖定！需要輸入 PUK2。"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"舊 PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"新增 PIN2"</string>
@@ -376,11 +373,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"請輸入 8 位數的 PUK2。"</string>
     <string name="pin2_changed" msgid="1639666438836544393">"已成功更改 PIN2 碼。"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"輸入 PUK2 碼"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"密碼不正確，PIN2 碼已被封鎖。請變更 PIN2 碼後再重試！"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"密碼不正確，請更改 PIN2 後再重試。"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"密碼不正確，SIM 卡已鎖定，需要輸入 PUK2 碼。"</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 碼已被永久封鎖。"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"還剩下 <xliff:g id="NUMBER">%d</xliff:g> 次機會輸入。"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 碼已解除封鎖！"</string>
     <string name="doneButton" msgid="2859593360997984240">"完成"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"電話會議 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"留言信箱號碼"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ec94d78..426ad6e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"自動選擇"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"自動選擇慣用網路"</string>
     <string name="register_automatically" msgid="6017849844573519637">"自動註冊…"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"偏好的網路類型"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"網路模式"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"變更網路操作模式"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"偏好的網路類型"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"優先網路模式"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"慣用網路模式：偏好 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"慣用網路模式：僅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"慣用網路模式：僅限 WCDMA"</string>
@@ -281,9 +281,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"多類別資訊"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"已啟用多類別資訊"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"已停用多類別資訊"</string>
-    <string name="network_lte" msgid="7702681952521375754">"LTE (建議)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"4G (建議)"</string>
-    <string name="network_global" msgid="1323190488685355309">"通用"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"選取系統"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"變更 CDMA 漫遊模式"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"選取系統"</string>
@@ -304,7 +301,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"啟動裝置"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"設定數據傳輸服務"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"行動通訊業者設定"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"固定撥號"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"固定撥號清單"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"啟用固定撥號"</string>
@@ -343,7 +341,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"您所輸入的 PIN 不正確，因此未更新 FDN。"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"號碼超過 20 位數的上限，因此未更新 FDN。"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"未更新 FDN。可能是因為 PIN2 碼不正確或電話號碼遭拒。"</string>
-    <string name="fdn_failed" msgid="540018079008319747">"FDN 操作失敗。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"正在從 SIM 卡讀取…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"您的 SIM 卡上沒有聯絡人。"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"選取要匯入的聯絡人"</string>
@@ -364,7 +361,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"已停用 SIM PIN。"</string>
     <string name="pin_failed" msgid="2298841192582192277">"您所輸入的 PIN 不正確。"</string>
     <string name="pin_changed" msgid="4365538014588501049">"已成功變更 SIM PIN。"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"密碼錯誤，PIN 已被封鎖。請提供 PUK。"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"密碼錯誤，SIM 已鎖定！需要 PUK2 解鎖。"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"舊的 PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"新的 PIN2"</string>
@@ -376,11 +373,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"輸入 8 個數字的 PUK2。"</string>
     <string name="pin2_changed" msgid="1639666438836544393">"已成功變更 PIN2。"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"輸入 PUK2 碼"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"密碼不正確，PIN2 已被封鎖。請變更 PIN2 後再重試！"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"密碼不正確，請變更 PIN2 後重試。"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"密碼不正確，SIM 已鎖住！請輸入 PUK2。"</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 遭到永久封鎖。"</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"還可以再嘗 <xliff:g id="NUMBER">%d</xliff:g> 次。"</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"PIN2 已解除封鎖！"</string>
     <string name="doneButton" msgid="2859593360997984240">"完成"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"多方通話<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"語音信箱號碼"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 79cbf46..48703b9 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -136,9 +136,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Khetha ngokuzenzakalela"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Khetha ngokuzenzakalela inethiwekhi ethandwayo"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Ukubhalisa okuzenzakalelayo..."</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Uhlobo lwenethiwekhi oluncamelayo"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Imodi Yenethiwekhi"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Shintsha imodi esebenzayo yenethiwekhi"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Uhlobo lwenethiwekhi oluncamelayo"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Imodi yenethiwekhi ekhethwayo"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Imodi yenethiwekhi ekhethwayo: i-WCDMA ekhethwayo"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Imodi yenethiwekhi ekhethwayo: i-GSM kuphela"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Imodi yenethiwekhi ekhethwayo: i-WCDMA kuphela"</string>
@@ -279,9 +279,6 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Izigaba-ningi"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Izigaba-ningi zivunyelwe"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Izigaba-ningi zivimbelwe"</string>
-    <string name="network_lte" msgid="7702681952521375754">"I-LTE (inconyiwe)"</string>
-    <string name="network_4G" msgid="2723512640529983138">"I-4G (inconyiwe)"</string>
-    <string name="network_global" msgid="1323190488685355309">"Emhlabeni jikelele"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Khetha uhlelo"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"Sintsha imodi yokuzulazula ye-cdma"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Khetha uhlelo"</string>
@@ -302,7 +299,8 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Yenza idivaysi isebenze"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Setha isevisi yedatha"</string>
-    <string name="carrier_settings_title" msgid="9028166176523012300">"Izilungiselelo zenkampini yenethiwekhi"</string>
+    <!-- no translation found for carrier_settings_title (9028166176523012300) -->
+    <skip />
     <string name="fdn" msgid="7878832555095183202">"Izinombolo Zokudayela Okungaguquki"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Uhlu lwe-FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Ukwenza kusebenze i-FDN"</string>
@@ -341,7 +339,6 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"I-FDN ayivuselelwanga ngoba uthayiphe i-PIN engalungile."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"I-FDN ayivuselelwanga ngoba inombolo ayikwazi ukudlula ezinombolweni ezingu-20."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"I-FDN ayibuyekeziwe. I-PIN2 kade ingalungile, noma inombolo yefoni yenqatshelwe."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Umsebenzi we-FDN wehlulekile."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Ifunda ekhadini le-SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Abekho othintana nabo ekhadini lakho le-SIM"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Khetha othintana nabo ozobangenisa"</string>
@@ -362,7 +359,7 @@
     <string name="disable_pin_ok" msgid="5596999379593924850">"I-PIN ye-SIM ivaliwe."</string>
     <string name="pin_failed" msgid="2298841192582192277">"I-PIN oyifakile ayilungile"</string>
     <string name="pin_changed" msgid="4365538014588501049">"I-PIN ye-SIM ishintshwe ngempumelelo"</string>
-    <string name="puk_requested" msgid="1796577128488773946">"Iphasiwedi ayilungile, iphinikhodi ivinjiwe, i-PUK iceliwe."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Iphasiwedi ayilungile, i-SIM ivaliwe! Kudingena i-PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"I-PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"I-PIN2 endala"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"I-PIN entsha"</string>
@@ -374,11 +371,8 @@
     <string name="invalidPuk2" msgid="1290977391033057871">"Thayipha i-PUK2 enezinombolo ezingu-8."</string>
     <string name="pin2_changed" msgid="1639666438836544393">"I-PIN2 ishintshwe ngokuphumelelayo"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Thayipha ikhodi ye-PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="3674058967950559397">"Iphasiwedi ayilungile, i-PIN2 ivinjiwe. Sicela ushintshe i- PIN2 bese uzama futhi!"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Iphasiwedi ayilungile, sicela ushintshe i-PIN2 bese uzama futhi!"</string>
     <string name="puk2_requested" msgid="8909278021238716877">"Iphasiwedi ayilungile, i-SIM ivaliwe! Kudingena i-PUK2."</string>
-    <string name="puk2_blocked" msgid="3150263853077280049">"I-PUK2 ivinjiwe unaphakade."</string>
-    <string name="pin2_attempts" msgid="7937503107162525324">\n"Kukhona imizamo engu-<xliff:g id="NUMBER">%d</xliff:g> esele."</string>
-    <string name="pin2_unblocked" msgid="2903147240919055381">"I-PIN2 ivulelwe!"</string>
     <string name="doneButton" msgid="2859593360997984240">"Kwenziwe"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Ikholi yengqungquthela <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Inombolo yevoyisimeyili"</string>
diff --git a/src/com/android/phone/CallController.java b/src/com/android/phone/CallController.java
index 0519280..cf8abea 100644
--- a/src/com/android/phone/CallController.java
+++ b/src/com/android/phone/CallController.java
@@ -24,6 +24,8 @@
 import com.android.phone.Constants.CallStatusCode;
 import com.android.phone.ErrorDialogActivity;
 
+import android.app.AlertDialog;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Handler;
@@ -320,7 +322,10 @@
             // or any of combinations
             String sipPhoneUri = intent.getStringExtra(
                     OutgoingCallBroadcaster.EXTRA_SIP_PHONE_URI);
-            phone = PhoneUtils.pickPhoneBasedOnNumber(mCM, scheme, number, sipPhoneUri);
+            ComponentName thirdPartyCallComponent = (ComponentName) intent.getParcelableExtra(
+                    OutgoingCallBroadcaster.EXTRA_THIRD_PARTY_CALL_COMPONENT);
+            phone = PhoneUtils.pickPhoneBasedOnNumber(mCM, scheme, number, sipPhoneUri,
+                    thirdPartyCallComponent);
             if (VDBG) log("- got Phone instance: " + phone + ", class = " + phone.getClass());
 
             // update okToCallStatus based on new phone
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index 80807a2..6094467 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -763,11 +763,12 @@
             }
         }
 
-        if ((fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM)
-                || (fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP)) {
+        if (fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM
+                || fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_SIP
+                || fgPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
             Call.State callState = mCM.getActiveFgCallState();
             if (!callState.isDialing()) {
-                // If call get activated or disconnected before the ringback
+                // If call gets activated or disconnected before the ringback
                 // tone stops, we have to stop it to prevent disturbing.
                 if (mInCallRingbackTonePlayer != null) {
                     mInCallRingbackTonePlayer.stopTone();
@@ -1274,8 +1275,9 @@
                         toneType = ToneGenerator.TONE_CDMA_NETWORK_BUSY_ONE_SHOT;
                         toneVolume = TONE_RELATIVE_VOLUME_LOPRI;
                         toneLengthMillis = 1000;
-                    } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                            || (phoneType == PhoneConstants.PHONE_TYPE_SIP)) {
+                    } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM
+                            || phoneType == PhoneConstants.PHONE_TYPE_SIP
+                            || phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
                         toneType = ToneGenerator.TONE_SUP_BUSY;
                         toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
                         toneLengthMillis = 4000;
diff --git a/src/com/android/phone/DTMFTonePlayer.java b/src/com/android/phone/DTMFTonePlayer.java
index b8adaf1..2b04415 100644
--- a/src/com/android/phone/DTMFTonePlayer.java
+++ b/src/com/android/phone/DTMFTonePlayer.java
@@ -365,7 +365,9 @@
      */
     private static boolean useShortDtmfTones(Phone phone, Context context) {
         int phoneType = phone.getPhoneType();
-        if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
+        if (phoneType == PhoneConstants.PHONE_TYPE_GSM
+                || phoneType == PhoneConstants.PHONE_TYPE_SIP
+                || phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
             return false;
         } else if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
             int toneType = android.provider.Settings.System.getInt(
@@ -377,8 +379,6 @@
             } 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/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java
index 6e0c13e..a27ea57 100644
--- a/src/com/android/phone/OutgoingCallBroadcaster.java
+++ b/src/com/android/phone/OutgoingCallBroadcaster.java
@@ -77,6 +77,8 @@
     public static final String EXTRA_SIP_PHONE_URI = "android.phone.extra.SIP_PHONE_URI";
     public static final String EXTRA_ACTUAL_NUMBER_TO_DIAL =
             "android.phone.extra.ACTUAL_NUMBER_TO_DIAL";
+    public static final String EXTRA_THIRD_PARTY_CALL_COMPONENT =
+            "android.phone.extra.THIRD_PARTY_CALL_COMPONENT";
 
     /**
      * Identifier for intent extra for sending an empty Flash message for
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 82b5e9f..9ad47ac 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -19,6 +19,7 @@
 import android.app.ActivityManager;
 import android.app.AppOpsManager;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
@@ -41,10 +42,12 @@
 import com.android.internal.telephony.DefaultPhoneNotifier;
 import com.android.internal.telephony.IccCard;
 import com.android.internal.telephony.ITelephony;
+import com.android.internal.telephony.IThirdPartyCallProvider;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CommandException;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.thirdpartyphone.ThirdPartyPhone;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -64,6 +67,7 @@
     private static final int CMD_ANSWER_RINGING_CALL = 4;
     private static final int CMD_END_CALL = 5;  // not used yet
     private static final int CMD_SILENCE_RINGER = 6;
+    private static final int CMD_NEW_INCOMING_THIRD_PARTY_CALL = 7;
 
     /** The singleton instance. */
     private static PhoneInterfaceManager sInstance;
@@ -90,6 +94,19 @@
         }
     }
 
+    private static final class IncomingThirdPartyCallArgs {
+        public final ComponentName component;
+        public final String callId;
+        public final String callerDisplayName;
+
+        public IncomingThirdPartyCallArgs(ComponentName component, String callId,
+                String callerDisplayName) {
+            this.component = component;
+            this.callId = callId;
+            this.callerDisplayName = callerDisplayName;
+        }
+    }
+
     /**
      * A handler that processes messages on the main thread in the phone process. Since many
      * of the Phone calls are not thread safe this is needed to shuttle the requests from the
@@ -171,6 +188,14 @@
                         request.notifyAll();
                     }
                     break;
+                case CMD_NEW_INCOMING_THIRD_PARTY_CALL: {
+                    request = (MainThreadRequest) msg.obj;
+                    IncomingThirdPartyCallArgs args = (IncomingThirdPartyCallArgs) request.argument;
+                    ThirdPartyPhone thirdPartyPhone = (ThirdPartyPhone)
+                            PhoneUtils.getThirdPartyPhoneFromComponent(mCM, args.component);
+                    thirdPartyPhone.takeIncomingCall(args.callId, args.callerDisplayName);
+                    break;
+                }
 
                 default:
                     Log.w(LOG_TAG, "MainThreadHandler: unexpected message code: " + msg.what);
@@ -217,6 +242,16 @@
     }
 
     /**
+     * Same as {@link #sendRequestAsync(int)} except it takes an argument.
+     * @see {@link #sendRequest(int,Object)}
+     */
+    private void sendRequestAsync(int command, Object argument) {
+        MainThreadRequest request = new MainThreadRequest(argument);
+        Message msg = mMainThreadHandler.obtainMessage(command, request);
+        msg.sendToTarget();
+    }
+
+    /**
      * Initialize the singleton PhoneInterfaceManager instance.
      * This is only done once, at startup, from PhoneApp.onCreate().
      */
@@ -726,10 +761,23 @@
         }
     }
 
+    @Override
     public void setCellInfoListRate(int rateInMillis) {
         mPhone.setCellInfoListRate(rateInMillis);
     }
 
+    @Override
+    public void newIncomingThirdPartyCall(ComponentName component, String callId,
+            String callerDisplayName) {
+        // TODO(sail): Enforce that the component belongs to the calling package.
+        if (DBG) {
+            log("newIncomingThirdPartyCall: component: " + component + " callId: " + callId);
+        }
+        enforceCallPermission();
+        sendRequestAsync(CMD_NEW_INCOMING_THIRD_PARTY_CALL, new IncomingThirdPartyCallArgs(
+                component, callId, callerDisplayName));
+    }
+
     //
     // Internal helper methods.
     //
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 2d44977..d3a8da5 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -21,6 +21,7 @@
 import android.app.ProgressDialog;
 import android.bluetooth.IBluetoothHeadsetPhone;
 import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -55,10 +56,12 @@
 import com.android.internal.telephony.MmiCode;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.internal.telephony.cdma.CdmaConnection;
 import com.android.internal.telephony.sip.SipPhone;
+import com.android.internal.telephony.thirdpartyphone.ThirdPartyPhone;
 import com.android.phone.CallGatewayManager.RawGatewayInfo;
 
 import java.util.ArrayList;
@@ -879,7 +882,8 @@
                 shouldMute = sConnectionMuteTable.get(
                         phone.getForegroundCall().getLatestConnection());
             } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                    || (phoneType == PhoneConstants.PHONE_TYPE_SIP)) {
+                    || (phoneType == PhoneConstants.PHONE_TYPE_SIP)
+                    || (phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY)) {
                 shouldMute = sConnectionMuteTable.get(c);
             }
             if (shouldMute == null) {
@@ -1430,7 +1434,8 @@
         if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
             conn = call.getLatestConnection();
         } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)) {
+                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)
+                || (phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY)) {
             conn = call.getEarliestConnection();
         } else {
             throw new IllegalStateException("Unexpected phone type: " + phoneType);
@@ -1534,6 +1539,9 @@
                     case PhoneConstants.PHONE_TYPE_GSM: log("  ==> PHONE_TYPE_GSM"); break;
                     case PhoneConstants.PHONE_TYPE_CDMA: log("  ==> PHONE_TYPE_CDMA"); break;
                     case PhoneConstants.PHONE_TYPE_SIP: log("  ==> PHONE_TYPE_SIP"); break;
+                    case PhoneConstants.PHONE_TYPE_THIRD_PARTY:
+                        log("  ==> PHONE_TYPE_THIRD_PARTY");
+                        break;
                     default: log("  ==> Unknown phone type"); break;
                 }
             }
@@ -2154,7 +2162,8 @@
             if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
                 answerCall(phone.getRingingCall());
             } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                    || (phoneType == PhoneConstants.PHONE_TYPE_SIP)) {
+                    || (phoneType == PhoneConstants.PHONE_TYPE_SIP)
+                    || (phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY)) {
                 if (hasActiveCall && hasHoldingCall) {
                     if (DBG) log("handleHeadsetHook: ringing (both lines in use) ==> answer!");
                     answerAndEndActive(app.mCM, phone.getRingingCall());
@@ -2298,7 +2307,8 @@
             return (app.cdmaPhoneCallState.getCurrentCallState()
                     == CdmaPhoneCallState.PhoneCallState.CONF_CALL);
         } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)) {
+                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)
+                || (phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY)) {
             // GSM: "Swap" is available if both lines are in use and there's no
             // incoming call.  (Actually we need to verify that the active
             // call really is in the ACTIVE state and the holding call really
@@ -2357,7 +2367,8 @@
             return ((fgCallState == Call.State.ACTIVE)
                     && (app.cdmaPhoneCallState.getAddCallMenuStateAfterCallWaiting()));
         } else if ((phoneType == PhoneConstants.PHONE_TYPE_GSM)
-                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)) {
+                || (phoneType == PhoneConstants.PHONE_TYPE_SIP)
+                || (phoneType == PhoneConstants.PHONE_TYPE_THIRD_PARTY)) {
             // GSM: "Add call" is available only if ALL of the following are true:
             // - There's no incoming ringing call
             // - There's < 2 lines in use
@@ -2546,19 +2557,25 @@
      * @param scheme the scheme from the data URI that the number originally came from.
      * @param number the phone number, or SIP address.
      */
-    public static Phone pickPhoneBasedOnNumber(CallManager cm,
-            String scheme, String number, String primarySipUri) {
+    public static Phone pickPhoneBasedOnNumber(CallManager cm, String scheme, String number,
+            String primarySipUri, ComponentName thirdPartyCallComponent) {
         if (DBG) {
             log("pickPhoneBasedOnNumber: scheme " + scheme
                     + ", number " + toLogSafePhoneNumber(number)
                     + ", sipUri "
-                    + (primarySipUri != null ? Uri.parse(primarySipUri).toSafeString() : "null"));
+                    + (primarySipUri != null ? Uri.parse(primarySipUri).toSafeString() : "null")
+                    + ", thirdPartyCallComponent: " + thirdPartyCallComponent);
         }
 
         if (primarySipUri != null) {
             Phone phone = getSipPhoneFromUri(cm, primarySipUri);
             if (phone != null) return phone;
         }
+
+        if (thirdPartyCallComponent != null) {
+            return getThirdPartyPhoneFromComponent(cm, thirdPartyCallComponent);
+        }
+
         return cm.getDefaultPhone();
     }
 
@@ -2577,6 +2594,20 @@
         return null;
     }
 
+    public static Phone getThirdPartyPhoneFromComponent(CallManager cm, ComponentName component) {
+        for (Phone phone : cm.getAllPhones()) {
+            if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_THIRD_PARTY) {
+                ThirdPartyPhone thirdPartyPhone = (ThirdPartyPhone) phone;
+                if (thirdPartyPhone.getCallProviderComponent().equals(component)) {
+                    return thirdPartyPhone;
+                }
+            }
+        }
+        ThirdPartyPhone thirdPartyPhone = PhoneFactory.makeThirdPartyPhone(component);
+        cm.registerPhone(thirdPartyPhone);
+        return thirdPartyPhone;
+    }
+
     /**
      * Returns true when the given call is in INCOMING state and there's no foreground phone call,
      * meaning the call is the first real incoming call the phone is having.
diff --git a/src/com/android/phone/SipCallOptionHandler.java b/src/com/android/phone/SipCallOptionHandler.java
index 5a7e91f..84fb7e3 100644
--- a/src/com/android/phone/SipCallOptionHandler.java
+++ b/src/com/android/phone/SipCallOptionHandler.java
@@ -19,6 +19,7 @@
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.thirdpartyphone.ThirdPartyPhone;
 import com.android.phone.sip.SipProfileDb;
 import com.android.phone.sip.SipSettings;
 import com.android.phone.sip.SipSharedPreferences;
@@ -26,9 +27,12 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -181,7 +185,7 @@
             if (!isRegularCall) {
                 showDialog(DIALOG_NO_VOIP);
             } else {
-                setResultAndFinish();
+                checkThirdPartyPhone();
             }
             return;
         }
@@ -221,8 +225,10 @@
             } else {
                 mUseSipPhone = false;
             }
+            setResultAndFinish();
+        } else {
+            checkThirdPartyPhone();
         }
-        setResultAndFinish();
     }
 
     /**
@@ -470,4 +476,39 @@
         }
         return null;
     }
+
+    private boolean isConnectedToWifi() {
+        ConnectivityManager cm = (ConnectivityManager) getSystemService(CONNECTIVITY_SERVICE);
+        if (cm != null) {
+            NetworkInfo ni = cm.getActiveNetworkInfo();
+            return ni != null && ni.isConnected() && ni.getType() == ConnectivityManager.TYPE_WIFI;
+        }
+        return false;
+    }
+
+    private void checkThirdPartyPhone() {
+        runOnUiThread(new Runnable() {
+            public void run() {
+                // TODO(sail): Move this out of this file or rename this file.
+                // TODO(sail): Move this logic to the switchboard.
+                if (isConnectedToWifi()) {
+                    Intent intent = new Intent(ThirdPartyPhone.ACTION_THIRD_PARTY_CALL_SERVICE);
+                    PackageManager pm = getPackageManager();
+                    // TODO(sail): Need to handle case where there are multiple services.
+                    // TODO(sail): Need to enforce permissions.
+                    ResolveInfo info = pm.resolveService(intent, 0);
+                    if (info != null && info.serviceInfo != null) {
+                        ComponentName component = new ComponentName(info.serviceInfo.packageName,
+                                info.serviceInfo.name);
+                        mIntent.putExtra(OutgoingCallBroadcaster.EXTRA_THIRD_PARTY_CALL_COMPONENT,
+                                component);
+                        PhoneGlobals.getInstance().callController.placeCall(mIntent);
+                        startDelayedFinish();
+                        return;
+                    }
+                }
+                setResultAndFinish();
+            }
+        });
+    }
 }
diff --git a/src/com/android/phone/v2/Call.java b/src/com/android/phone/v2/Call.java
new file mode 100644
index 0000000..460b33c
--- /dev/null
+++ b/src/com/android/phone/v2/Call.java
@@ -0,0 +1,5 @@
+package com.android.phone;
+
+public class Call {
+
+}
diff --git a/src/com/android/phone/v2/CallService.java b/src/com/android/phone/v2/CallService.java
new file mode 100644
index 0000000..fb9d989
--- /dev/null
+++ b/src/com/android/phone/v2/CallService.java
@@ -0,0 +1,14 @@
+package com.android.phone;
+
+import com.android.phone.control.CallServiceAdapter;
+import com.android.phone.exceptions.OutgoingCallException;
+
+public interface CallService {
+
+  public void setCallServiceAdapter(CallServiceAdapter adapter);
+
+  public boolean isCompatibleWith(String userInput, ContactInfo contactInfo);
+
+  public void placeOutgoingCall(String userInput, ContactInfo contactInfo)
+    throws OutgoingCallException;
+}
diff --git a/src/com/android/phone/v2/CallServiceType.java b/src/com/android/phone/v2/CallServiceType.java
new file mode 100644
index 0000000..b0fe4f0
--- /dev/null
+++ b/src/com/android/phone/v2/CallServiceType.java
@@ -0,0 +1,11 @@
+package com.android.phone;
+
+public enum CallServiceType {
+  GSM,
+  CDMA,
+  THIRD_PARTY,
+
+  // Allowing the system to choose one of the above values based on whatever
+  // heuristics it might have.
+  DONT_CARE
+}
diff --git a/src/com/android/phone/v2/ContactInfo.java b/src/com/android/phone/v2/ContactInfo.java
new file mode 100644
index 0000000..7ccbb2f
--- /dev/null
+++ b/src/com/android/phone/v2/ContactInfo.java
@@ -0,0 +1,4 @@
+package com.android.phone;
+
+public class ContactInfo {
+}
diff --git a/src/com/android/phone/v2/control/CallLogManager.java b/src/com/android/phone/v2/control/CallLogManager.java
new file mode 100644
index 0000000..e45e014
--- /dev/null
+++ b/src/com/android/phone/v2/control/CallLogManager.java
@@ -0,0 +1,5 @@
+package com.android.phone.control;
+
+/** Package private */
+class CallLogManager {
+}
diff --git a/src/com/android/phone/v2/control/CallRejectionPolicy.java b/src/com/android/phone/v2/control/CallRejectionPolicy.java
new file mode 100644
index 0000000..031bd87
--- /dev/null
+++ b/src/com/android/phone/v2/control/CallRejectionPolicy.java
@@ -0,0 +1,7 @@
+package com.android.phone.control;
+
+// Can be used to reject incoming calls, see CallRestrictionPolicy regarding
+// outgoing calls.
+public interface CallRejectionPolicy {
+
+}
diff --git a/src/com/android/phone/v2/control/CallRestrictionPolicy.java b/src/com/android/phone/v2/control/CallRestrictionPolicy.java
new file mode 100644
index 0000000..d91399e
--- /dev/null
+++ b/src/com/android/phone/v2/control/CallRestrictionPolicy.java
@@ -0,0 +1,16 @@
+package com.android.phone.control;
+
+import com.android.phone.ContactInfo;
+import com.android.phone.exceptions.RestrictedCallException;
+
+// Can be used to prevent outgoing calls based on arbitrary restrictions across
+// call services (e.g. black listing a phone number regardless if it is
+// attempted over PSTN or WiFi).  That being the case, FDN which is specific to
+// GSM may need to be implemented separately since these policies are generally
+// invoked before a particular call service is selected.
+// See http://en.wikipedia.org/wiki/Fixed_Dialing_Number and CallRejectionPolicy
+// regarding incoming calls.
+public interface CallRestrictionPolicy {
+  public boolean validate(String userInput, ContactInfo contactInfo)
+      throws RestrictedCallException;
+}
diff --git a/src/com/android/phone/v2/control/CallServiceAdapter.java b/src/com/android/phone/v2/control/CallServiceAdapter.java
new file mode 100644
index 0000000..ab4b85e
--- /dev/null
+++ b/src/com/android/phone/v2/control/CallServiceAdapter.java
@@ -0,0 +1,18 @@
+package com.android.phone.control;
+
+import com.android.phone.CallService;
+
+/**
+ * Only exposes the CallsManager APIs that CallService implementations should
+ * have access to.
+ */
+public class CallServiceAdapter {
+  private CallsManager callsManager;
+
+  private CallService callService;
+
+  /** Package private */
+  CallServiceAdapter(CallsManager callsManager) {
+    this.callsManager = callsManager;
+  }
+}
diff --git a/src/com/android/phone/v2/control/CallServiceRegistry.java b/src/com/android/phone/v2/control/CallServiceRegistry.java
new file mode 100644
index 0000000..80ed434
--- /dev/null
+++ b/src/com/android/phone/v2/control/CallServiceRegistry.java
@@ -0,0 +1,26 @@
+package com.android.phone.control;
+
+import com.android.phone.CallService;
+
+/** Singleton */
+public class CallServiceRegistry {
+  private static final CallServiceRegistry INSTANCE = new CallServiceRegistry();
+
+  private CallServiceRegistry() {
+  }
+
+  public static CallServiceRegistry getInstance() {
+    return INSTANCE;
+  }
+
+  public void register(CallService callService) {
+
+    // TODO: Remove concept of registering call service since they will be short-lived
+    if (callService != null) {
+      CallsManager callsManager = CallsManager.getInstance();
+      if (callsManager != null) {
+        callsManager.addCallService(callService);
+      }
+    }
+  }
+}
diff --git a/src/com/android/phone/v2/control/CallsManager.java b/src/com/android/phone/v2/control/CallsManager.java
new file mode 100644
index 0000000..2bff4e3
--- /dev/null
+++ b/src/com/android/phone/v2/control/CallsManager.java
@@ -0,0 +1,63 @@
+package com.android.phone.control;
+
+import com.android.phone.CallService;
+import com.android.phone.ContactInfo;
+import com.android.phone.exceptions.CallServiceUnavailableException;
+import com.android.phone.exceptions.RestrictedCallException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Singleton */
+public class CallsManager {
+
+  private static final CallsManager INSTANCE = new CallsManager();
+
+  private DialerAdapter dialerAdapter;
+
+  private InCallAdapter inCallAdapter;
+
+  private Switchboard switchboard;
+
+  private CallLogManager callLogManager;
+
+  private VoicemailManager voicemailManager;
+
+  private List<CallRestrictionPolicy> restrictionPolicies =
+      new ArrayList<CallRestrictionPolicy>();
+
+  private List<CallRejectionPolicy> rejectionPolicies =
+      new ArrayList<CallRejectionPolicy>();
+
+  // Singleton, private constructor (see getInstance).
+  private CallsManager() {
+    switchboard = new Switchboard();
+    callLogManager = new CallLogManager();
+    voicemailManager = new VoicemailManager();  // As necessary etc.
+  }
+
+  /** Package private */
+  static CallsManager getInstance() {
+    return INSTANCE;
+  }
+
+  /** Package private */
+  void addCallService(CallService callService) {
+    if (callService != null) {
+      switchboard.addCallService(callService);
+      callService.setCallServiceAdapter(new CallServiceAdapter(this));
+    }
+  }
+
+  /** Package private */
+  void connectTo(String userInput, ContactInfo contactInfo)
+      throws RestrictedCallException, CallServiceUnavailableException {
+
+    for (CallRestrictionPolicy policy : restrictionPolicies) {
+      policy.validate(userInput, contactInfo);
+    }
+
+    // No objection to issue the call, proceed with trying to put it through.
+    switchboard.placeOutgoingCall(userInput, contactInfo);
+  }
+}
diff --git a/src/com/android/phone/v2/control/DialerAdapter.java b/src/com/android/phone/v2/control/DialerAdapter.java
new file mode 100644
index 0000000..e9a054d
--- /dev/null
+++ b/src/com/android/phone/v2/control/DialerAdapter.java
@@ -0,0 +1,25 @@
+package com.android.phone.control;
+
+import com.android.phone.ContactInfo;
+import com.android.phone.exceptions.CallServiceUnavailableException;
+import com.android.phone.exceptions.RestrictedCallException;
+import com.android.phone.ui.dialer.DialerController;
+
+/** Only exposes the CallsManager APIs that the Dialer should have access to. */
+// TODO: This class may not be necessary since we do not interact with Dialer directly.
+public class DialerAdapter {
+  private CallsManager callsManager;
+
+  private DialerController dialerUi;
+
+  /** Package private */
+  DialerAdapter(CallsManager callsManager) {
+    this.callsManager = callsManager;
+  }
+
+  public void connectTo(String userInput, ContactInfo contactInfo)
+      throws RestrictedCallException, CallServiceUnavailableException {
+
+    callsManager.connectTo(userInput, contactInfo);
+  }
+}
diff --git a/src/com/android/phone/v2/control/InCallAdapter.java b/src/com/android/phone/v2/control/InCallAdapter.java
new file mode 100644
index 0000000..0fc80bd
--- /dev/null
+++ b/src/com/android/phone/v2/control/InCallAdapter.java
@@ -0,0 +1,15 @@
+package com.android.phone.control;
+
+import com.android.phone.ui.incall.InCallController;
+
+/** Only exposes the CallsManager APIs that In-Call should have access to. */
+public class InCallAdapter {
+  private CallsManager callsManager;
+
+  private InCallController inCallUi;
+
+  /** Package private */
+  InCallAdapter(CallsManager callsManager) {
+    this.callsManager = callsManager;
+  }
+}
diff --git a/src/com/android/phone/v2/control/Switchboard.java b/src/com/android/phone/v2/control/Switchboard.java
new file mode 100644
index 0000000..e2217c2
--- /dev/null
+++ b/src/com/android/phone/v2/control/Switchboard.java
@@ -0,0 +1,65 @@
+package com.android.phone.control;
+
+import com.android.phone.CallService;
+import com.android.phone.ContactInfo;
+import com.android.phone.exceptions.CallServiceUnavailableException;
+import com.android.phone.exceptions.OutgoingCallException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Package private */
+class Switchboard {
+
+  private SwitchboardOptimizer optimizer;
+
+  private List<CallService> callServices = new ArrayList<CallService>();
+
+  /** Package private */
+  void addCallService(CallService callService) {
+    if (callService != null && !callServices.contains(callService)) {
+      callServices.add(callService);
+    }
+  }
+
+  /** Package private */
+  void placeOutgoingCall(String userInput, ContactInfo contactInfo)
+      throws CallServiceUnavailableException {
+
+    if (callServices.isEmpty()) {
+      // No call services, bail out.
+      // TODO(contacts-team): Add logging?
+      throw new CallServiceUnavailableException();
+    }
+
+    List<CallService> compatibleCallServices = new ArrayList<CallService>();
+    for (CallService service : callServices) {
+      if (service.isCompatibleWith(userInput, contactInfo)) {
+        // NOTE(android-contacts): If we end up taking the liberty to issue
+        // calls not using the explicit user input (in case one is provided)
+        // and instead pull an alternative method of communication from the
+        // specified user-info object, it may be desirable to give precedence
+        // to services that can in fact respect the user's intent.
+        compatibleCallServices.add(service);
+      }
+    }
+
+    if (compatibleCallServices.isEmpty()) {
+      // None of the available call services is suitable for making this call.
+      // TODO(contacts-team): Same here re logging.
+      throw new CallServiceUnavailableException();
+    }
+
+    // NOTE(android-team): At this point we can also prompt the user for
+    // preference, i.e. instead of the logic just below.
+    if (compatibleCallServices.size() > 1) {
+      compatibleCallServices = optimizer.sort(compatibleCallServices);
+    }
+    for (CallService service : compatibleCallServices) {
+      try {
+        service.placeOutgoingCall(userInput, contactInfo);
+        return;
+      } catch (OutgoingCallException ignored) { }
+    }
+  }
+}
diff --git a/src/com/android/phone/v2/control/SwitchboardOptimizer.java b/src/com/android/phone/v2/control/SwitchboardOptimizer.java
new file mode 100644
index 0000000..ff0ecaf
--- /dev/null
+++ b/src/com/android/phone/v2/control/SwitchboardOptimizer.java
@@ -0,0 +1,19 @@
+package com.android.phone.control;
+
+import com.android.phone.CallService;
+
+import java.util.List;
+
+/** Package private */
+// TODO(android-contacts): See SwitchboardOptimizer (inner class) under
+// https://critique.corp.google.com/#review/55374749/depot/google3/experimental/users/gilad/nova/prototype/phone/core/Switchboard.java
+class SwitchboardOptimizer {
+
+  /** Package private */
+  List<CallService> sort(List<CallService> callServices) {
+    // TODO(android-contacts): Sort by reliability, cost, and ultimately
+    // the desirability to issue a given call over each of the specified
+    // call services.
+    return callServices;
+  }
+}
diff --git a/src/com/android/phone/v2/control/VoicemailManager.java b/src/com/android/phone/v2/control/VoicemailManager.java
new file mode 100644
index 0000000..1271873
--- /dev/null
+++ b/src/com/android/phone/v2/control/VoicemailManager.java
@@ -0,0 +1,5 @@
+package com.android.phone.control;
+
+/** Package private */
+class VoicemailManager {
+}
diff --git a/src/com/android/phone/v2/exceptions/CallServiceUnavailableException.java b/src/com/android/phone/v2/exceptions/CallServiceUnavailableException.java
new file mode 100644
index 0000000..6d21b79
--- /dev/null
+++ b/src/com/android/phone/v2/exceptions/CallServiceUnavailableException.java
@@ -0,0 +1,19 @@
+package com.android.phone.exceptions;
+
+public class CallServiceUnavailableException extends Exception {
+  public CallServiceUnavailableException() {
+    super();
+  }
+
+  public CallServiceUnavailableException(String message) {
+    super(message);
+  }
+
+  public CallServiceUnavailableException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public CallServiceUnavailableException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/com/android/phone/v2/exceptions/NoCompatibleCallServiceException.java b/src/com/android/phone/v2/exceptions/NoCompatibleCallServiceException.java
new file mode 100644
index 0000000..42124bc
--- /dev/null
+++ b/src/com/android/phone/v2/exceptions/NoCompatibleCallServiceException.java
@@ -0,0 +1,19 @@
+package com.android.phone.exceptions;
+
+public class NoCompatibleCallServiceException extends Exception {
+  public NoCompatibleCallServiceException() {
+    super();
+  }
+
+  public NoCompatibleCallServiceException(String message) {
+    super(message);
+  }
+
+  public NoCompatibleCallServiceException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public NoCompatibleCallServiceException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/com/android/phone/v2/exceptions/OutgoingCallException.java b/src/com/android/phone/v2/exceptions/OutgoingCallException.java
new file mode 100644
index 0000000..cecd2cb
--- /dev/null
+++ b/src/com/android/phone/v2/exceptions/OutgoingCallException.java
@@ -0,0 +1,20 @@
+package com.android.phone.exceptions;
+
+public class OutgoingCallException extends Exception {
+  public OutgoingCallException() {
+    super();
+  }
+
+  public OutgoingCallException(String message) {
+    super(message);
+  }
+
+  public OutgoingCallException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public OutgoingCallException(Throwable cause) {
+    super(cause);
+  }
+}
+
diff --git a/src/com/android/phone/v2/exceptions/RestrictedCallException.java b/src/com/android/phone/v2/exceptions/RestrictedCallException.java
new file mode 100644
index 0000000..bf4decf
--- /dev/null
+++ b/src/com/android/phone/v2/exceptions/RestrictedCallException.java
@@ -0,0 +1,19 @@
+package com.android.phone.exceptions;
+
+public class RestrictedCallException extends Exception {
+  public RestrictedCallException() {
+    super();
+  }
+
+  public RestrictedCallException(String message) {
+    super(message);
+  }
+
+  public RestrictedCallException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public RestrictedCallException(Throwable cause) {
+    super(cause);
+  }
+}
diff --git a/src/com/android/phone/v2/ui/dialer/DialerController.java b/src/com/android/phone/v2/ui/dialer/DialerController.java
new file mode 100644
index 0000000..b7753da
--- /dev/null
+++ b/src/com/android/phone/v2/ui/dialer/DialerController.java
@@ -0,0 +1,24 @@
+package com.android.phone.ui.dialer;
+
+import com.android.phone.ContactInfo;
+import com.android.phone.control.DialerAdapter;
+import com.android.phone.exceptions.CallServiceUnavailableException;
+import com.android.phone.exceptions.RestrictedCallException;
+
+public class DialerController {
+
+  DialerUi ui;
+
+  DialerAdapter dialerAdapter;
+
+  /** Package private */
+  void dial(String userInput, ContactInfo ontactInfo) {
+    try {
+      dialerAdapter.connectTo(userInput, ontactInfo);
+    } catch (RestrictedCallException e) {
+      // TODO(android-contacts): Handle the exception.
+    } catch (CallServiceUnavailableException e) {
+      // TODO(android-contacts): Handle the exception.
+    }
+  }
+}
diff --git a/src/com/android/phone/v2/ui/dialer/DialerUi.java b/src/com/android/phone/v2/ui/dialer/DialerUi.java
new file mode 100644
index 0000000..a600945
--- /dev/null
+++ b/src/com/android/phone/v2/ui/dialer/DialerUi.java
@@ -0,0 +1,18 @@
+package com.android.phone.ui.dialer;
+
+import com.android.phone.ContactInfo;
+
+/** Package-private? */
+
+// Only responsible for reflecting the necessary display changes and relaying
+// user actions back to the DialerController.
+class DialerUi {
+  private DialerController dialerController;
+
+  void outgoingCallScenario() {
+    String userInput = "5551212";  // Can also be an email address etc.
+    ContactInfo contactInfo = new ContactInfo();  // In case one can be retrieved.
+
+    dialerController.dial(userInput, contactInfo);
+  }
+}
diff --git a/src/com/android/phone/v2/ui/incall/InCallController.java b/src/com/android/phone/v2/ui/incall/InCallController.java
new file mode 100644
index 0000000..84750d6
--- /dev/null
+++ b/src/com/android/phone/v2/ui/incall/InCallController.java
@@ -0,0 +1,10 @@
+package com.android.phone.ui.incall;
+
+import com.android.phone.control.InCallAdapter;
+
+public class InCallController {
+
+  InCallUi ui;
+
+  InCallAdapter inCallAdapter;
+}
diff --git a/src/com/android/phone/v2/ui/incall/InCallUi.java b/src/com/android/phone/v2/ui/incall/InCallUi.java
new file mode 100644
index 0000000..dde9ab9
--- /dev/null
+++ b/src/com/android/phone/v2/ui/incall/InCallUi.java
@@ -0,0 +1,9 @@
+package com.android.phone.ui.incall;
+
+/** Package-private? */
+
+// Only responsible for reflecting the necessary display changes and relaying
+// user actions back to the InCallController.
+class InCallUi {
+  private InCallController controller;
+}