diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d9a68b0..bfad614 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -93,7 +93,7 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Настройки за пренасочване на обаждане (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Настройки за прехвърляне на обаждане (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Пренасочване на обаждания"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Да се пренасочва винаги"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Винаги използвайте този номер"</string>
@@ -111,7 +111,7 @@
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Пренасочва се към <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Изключено"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Операторът ви не поддържа деактивиране на пренасочването на обаждания, когато телефонът ви не отговаря."</string>
-    <string name="labelCFNRc" msgid="2614827454402079766">"Когато няма достъп"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Когато няма връзка"</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>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 737817f..896eb03 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -46,7 +46,7 @@
     <string name="no_vm_number_msg" msgid="1300729501030053828">"সিম কার্ডটিতে কোনো ভয়েসমেল নম্বর সংরক্ষিত নেই৷"</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"একটি নম্বর যোগ করুন"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"আপনার সিম কার্ডকে অবরোধ মুক্ত করা হয়েছে৷ আপনার ফোন আনলক করা হচ্ছে..."</string>
-    <string name="label_ndp" msgid="780479633159517250">"সিম নেটওয়ার্ক আনলক পিন"</string>
+    <string name="label_ndp" msgid="780479633159517250">"সিম নেটওয়ার্ক আনলক PIN"</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>
@@ -339,7 +339,7 @@
     <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 অ্যাক্সেসের জন্য PIN পরিবর্তন করুন"</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>
@@ -364,7 +364,7 @@
     <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="pin2_invalid" msgid="5470854099230755944">"আপনি একটি ভুল PIN টাইপ করায় FDN আপডেট করা হয়নি৷"</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN আপডেট করা হয়নি কারণ নম্বরটি ২০ সংখ্যার বেশি হলে চলবে না৷"</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN আপডেট করা হয়নি৷ PIN2 ভুল ছিল, বা ফোন নম্বর বাতিল করা হয়েছে৷"</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN অপারেশন ব্যর্থ হয়েছে৷"</string>
@@ -372,23 +372,23 @@
     <string name="simContacts_empty" msgid="5270660846489561932">"আপনার সিম কার্ডে কোনো পরিচিত নেই৷"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"পরিচিতগুলি আমদানি করুন"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM কার্ডটি থেকে পরিচিতিগুলি আমদানি করতে বিমান মোড বন্ধ করুন৷"</string>
-    <string name="enable_pin" msgid="5422767284133234860">"সিম পিন সক্ষম/অক্ষম করুন"</string>
-    <string name="change_pin" msgid="9174186126330785343">"সিম পিন পরিবর্তন করুন"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"সিম পিন:"</string>
-    <string name="oldPinLabel" msgid="5287773661246368314">"পুরোনো পিন"</string>
-    <string name="newPinLabel" msgid="207488227285336897">"নতুন পিন"</string>
+    <string name="enable_pin" msgid="5422767284133234860">"সিম PIN সক্ষম/অক্ষম করুন"</string>
+    <string name="change_pin" msgid="9174186126330785343">"সিম PIN পরিবর্তন করুন"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"সিম PIN:"</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">"আপনার দ্বারা টাইপ করা পুরানো পিন সঠিক নয়৷ আবার চেষ্টা করুন৷"</string>
+    <string name="badPin" msgid="8955102849303984935">"আপনার দ্বারা টাইপ করা পুরানো PIN সঠিক নয়৷ আবার চেষ্টা করুন৷"</string>
     <string name="mismatchPin" msgid="5923253370683071889">"আপনার টাইপ করা PINগুলি মিলছে না৷ আবার চেষ্টা করুন৷"</string>
-    <string name="invalidPin" msgid="5981171102258684792">"৪ থেকে ৮ সংখ্যা বিশিষ্ট একটি পিন টাইপ করুন৷"</string>
-    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM এর পিন সাফ করুন"</string>
-    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM এর পিন সেট করুন"</string>
-    <string name="enable_in_progress" msgid="3417917024688497010">"পিন সেটিং…"</string>
-    <string name="enable_pin_ok" msgid="2918545971413270063">"পিন সেট করুন"</string>
-    <string name="disable_pin_ok" msgid="2109571368635883688">"পিন সাফ করা হয়েছে"</string>
-    <string name="pin_failed" msgid="5644377896213584760">"পিন ভুল"</string>
-    <string name="pin_changed" msgid="4455736268023261662">"পিন আপডেট হয়েছে"</string>
-    <string name="puk_requested" msgid="5921393215789090200">"পাসওয়ার্ডটি ভুল৷ পিন এখন অবরুদ্ধ৷ PUK এর জন্য অনুরোধ করা হয়েছে৷"</string>
+    <string name="invalidPin" msgid="5981171102258684792">"৪ থেকে ৮ সংখ্যা বিশিষ্ট একটি PIN টাইপ করুন৷"</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM এর PIN সাফ করুন"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM এর PIN সেট করুন"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN সেটিং…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN সেট করুন"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN সাফ করা হয়েছে"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN ভুল"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN আপডেট হয়েছে"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"পাসওয়ার্ডটি ভুল৷ PIN এখন অবরুদ্ধ৷ PUK এর জন্য অনুরোধ করা হয়েছে৷"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"পুরোনো PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"নতুন PIN2"</string>
@@ -400,7 +400,7 @@
     <string name="invalidPuk2" msgid="7059081153334815973">"৮ সংখ্যার একটি PIN2 লিখুন৷"</string>
     <string name="pin2_changed" msgid="3724522579945610956">"PIN2 আপডেট হয়েছে"</string>
     <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 কোড লিখুন"</string>
-    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"পাসওয়ার্ডটি ভুল৷ পিন2 এখন অবরুদ্ধ৷ আবার চেষ্টা করতে, পিন 2 পরিবর্তন করুন৷"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"পাসওয়ার্ডটি ভুল৷ PIN2 এখন অবরুদ্ধ৷ আবার চেষ্টা করতে, PIN 2 পরিবর্তন করুন৷"</string>
     <string name="puk2_requested" msgid="5831015200030161434">"পাসওয়ার্ডটি ভুল৷ SIM এখন অবরুদ্ধ৷ PUK2 লিখুন৷"</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 স্থায়ীভাবে অবরুদ্ধ করা হয়েছে৷"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"আপনার কাছে <xliff:g id="NUMBER">%d</xliff:g>টি প্রচেষ্টা অবশিষ্ট রয়েছে৷"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 676fe4e..01e06d1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -79,7 +79,7 @@
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Εκπομπές έκτακτης ανάγκης"</string>
     <string name="call_settings" msgid="6112441768261754562">"Ρυθμίσεις κλήσης"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Πρόσθετες ρυθμίσεις"</string>
-    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Ρυθμίσεις (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Επιπλέον ρυθμίσεις (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -111,7 +111,7 @@
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Προώθηση στο <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Ανενεργό"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Η εταιρεία σας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας δεν απαντάει."</string>
-    <string name="labelCFNRc" msgid="2614827454402079766">"Όταν δεν είμαι διαθέσιμος/η"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Όταν είναι αδύνατη η επικοινωνία"</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>
@@ -143,7 +143,7 @@
     <string name="no_change" msgid="3186040086622435212">"Δεν έγιναν αλλαγές."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Επιλογή υπηρεσίας αυτόματου τηλεφωνητή"</string>
     <string name="voicemail_default" msgid="2001233554889016880">"Ο πάροχος κινητής τηλεφωνίας"</string>
-    <string name="mobile_networks" msgid="2843854043339307375">"Ρυθμίσεις δικτ. κιν. τηλ."</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Ρυθμίσεις δικτύου κινητής τηλεφωνίας"</string>
     <string name="label_available" msgid="1181658289009300430">"Διαθέσιμα δίκτυα"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Αναζήτηση..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Δεν βρέθηκαν δίκτυα."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 92384c1..eb36b96 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -112,7 +112,7 @@
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Desactivado"</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="2614827454402079766">"Cuando está inaccesible"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se puede establecer la llamada"</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>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Tu proveedor no admite la inhabilitación del desvío de llamadas cuando no se puede acceder a tu teléfono."</string>
@@ -332,7 +332,7 @@
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista de FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Los números de marcación fija (NMF) están desactivados."</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Los números de marcación fija (NMF) están desactivados"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Activar NMF"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Desactivar NMF"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Cambiar PIN2"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index be44bb3..57a0f24 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -195,7 +195,7 @@
     <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"‏حالت پیشرفته 4G LTE"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"‏استفاده از سرویس‌های LTE جهت بهبود ارتباطات صوتی و سایر ارتباطات (توصیه می‌شود)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"داده‌ها فعال شدند"</string>
-    <string name="data_enable_summary" msgid="2382798156640007971">"استفاده از داده مجاز است"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"اجازه استفاده از داده"</string>
     <string name="roaming" msgid="8871412572928323707">"رومینگ داده"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
@@ -370,7 +370,7 @@
     <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>
+    <string name="simContacts_title" msgid="1861472842524839921">"انتخاب مخاطبین برای ورود"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"برای وارد کردن مخاطبین از سیم کارت، حالت هواپیما را خاموش کنید."</string>
     <string name="enable_pin" msgid="5422767284133234860">"فعال کردن/غیر فعال کردن پین سیم"</string>
     <string name="change_pin" msgid="9174186126330785343">"تغییر پین سیم"</string>
@@ -475,7 +475,7 @@
   </string-array>
     <string name="network_info_message" msgid="7738596060242881930">"پیام شبکه"</string>
     <string name="network_error_message" msgid="3394780436230411413">"پیام خطا"</string>
-    <string name="ota_title_activate" msgid="8616918561356194398">"فعال کردن تلفن"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"فعال کردن گوشی خود"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"برای فعال کردن سرویس گوشی خود، باید یک تماس ویژه برقرار کنید. \n\nبعد از فشردن \"فعال سازی\"، به دستورالعمل‌های ارائه شده جهت فعال کردن گوشی، گوش کنید."</string>
     <string name="ota_hfa_activation_title" msgid="2234246934160473981">"درحال فعال‌سازی…"</string>
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"این تلفن در حال فعال کردن خدمات داده دستگاه همراه شما است.\n\nاین کار حداکثر ۵ دقیقه زمان می‌برد."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9c6cd14..3ceb99d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -143,7 +143,7 @@
     <string name="no_change" msgid="3186040086622435212">"Aucune modification n\'a été apportée."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Choisissez un service de messagerie vocale."</string>
     <string name="voicemail_default" msgid="2001233554889016880">"Votre opérateur"</string>
-    <string name="mobile_networks" msgid="2843854043339307375">"Paramètres réseau mobile"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Paramètres du réseau mobile"</string>
     <string name="label_available" msgid="1181658289009300430">"Réseaux disponibles"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Recherche..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Aucun réseau trouvé."</string>
@@ -327,7 +327,7 @@
     <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>
     <string name="fdn" msgid="7878832555095183202">"Numéros autorisés"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Num. autorisés (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Numéros aut. (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste de numéros autorisés"</string>
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Liste num. aut. (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activation des numéros autorisés"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9fb5acf..8e3f08e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -120,7 +120,7 @@
     <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Postavke može mijenjati samo primarni korisnik."</string>
     <string name="call_settings_with_label" msgid="89359812614544532">"Post. poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Pogreška postavki poziva"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Čitanje postavki..."</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Postavke čitanja..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Ažuriranje postavki..."</string>
     <string name="reverting_settings" msgid="4752151682666912828">"Povrat postavki…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočekivan mrežni odgovor."</string>
@@ -332,7 +332,7 @@
     <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN popis (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivacija FDN-a"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Brojevi za fiksno biranje su omogućeni"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Brojevi za fiksno biranje onemogućeni su"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Brojevi za fiksno biranje su onemogućeni"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Omogući FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Onemogući FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Promijeni PIN2"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 40931c2..ea11ed2 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -481,7 +481,7 @@
     <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"A telefon aktiválja a mobiladat-szolgáltatást.\n\nEz akár 5 percet is igénybe vehet."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Kihagyja az aktiválást?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ha kihagyja az aktiválást, nem indíthat hívásokat és nem kapcsolódhat mobil adathálózatokhoz (de csatlakozhat Wi-Fi hálózatokhoz). Amíg nem aktiválja telefonját, az minden egyes bekapcsoláskor felkéri Önt erre."</string>
-    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Kihagyás"</string>
+    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Átugrás"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktiválás"</string>
     <string name="ota_title_activate_success" msgid="6570240212263372046">"A telefon aktiválva."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Gond volt az aktiválással"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 964c89a..29a3285 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -92,9 +92,9 @@
     <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="call_forwarding_settings_with_label" msgid="8569489414006897127">"ಕರೆ ಫಾರ್ವರ್ಡ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="labelCF" msgid="2574386948026924737">"ಕರೆ ಫಾರ್ವರ್ಡ್‌ ಮಾಡುವಿಕೆ"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"ಕರೆ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"ಕರೆ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -110,12 +110,12 @@
     <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="3884684060443538097">"ಆಫ್ ಆಗಿದೆ"</string>
-    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ನಿಮ್ಮ ಫೋನ್‌ ಉತ್ತರಿಸದಿರುವಾಗ ಕರೆ ಫಾರ್ವರ್ಡ್‌ ಮಾಡುವಿಕೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದನ್ನು ನಿಮ್ಮ ಆಪರೇಟರ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ನಿಮ್ಮ ಫೋನ್‌ ಉತ್ತರಿಸದಿರುವಾಗ ಕರೆಯ ಫಾರ್ವರ್ಡ್‌ ಮಾಡುವಿಕೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದನ್ನು ನಿಮ್ಮ ಆಪರೇಟರ್ ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"ಅಲಭ್ಯವಿರುವಾಗ"</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="call_settings_primary_user_only" msgid="5679923943740900965">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಕೇವಲ ಪ್ರಾಥಮಿಕ ಬಳಕೆದಾರರು ಮಾತ್ರ ಬದಲಾಯಿಸಬಹುದು."</string>
     <string name="call_settings_with_label" msgid="89359812614544532">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -142,7 +142,7 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"ಪ್ರಸ್ತುತ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ ಸಂಖ್ಯೆಯ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಹಿಂಪಡೆಯಲು ಮತ್ತು ಉಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.\nಏನೇ ಆಗಲಿ ಹೊಸ ಪೂರೈಕೆದಾರರಿಗೆ ಬದಲಾಯಿಸಬಹುದೇ?"</string>
     <string name="no_change" msgid="3186040086622435212">"ಯಾವುದೇ ಬದಲಾವಣೆಗಳನ್ನು ಮಾಡಲಿಲ್ಲ."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"ಧ್ವನಿಮೇಲ್‌ ಸೇವೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="voicemail_default" msgid="2001233554889016880">"ನನ್ನ ವಾಹಕ"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"ನಿಮ್ಮ ವಾಹಕ"</string>
     <string name="mobile_networks" msgid="2843854043339307375">"ಸೆಲ್ಯುಲಾರ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="label_available" msgid="1181658289009300430">"ಲಭ್ಯವಿರುವ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
@@ -481,7 +481,7 @@
     <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_skip_label" msgid="3458532775091563208">"ಸ್ಕಿಪ್"</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>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"ಸಕ್ರಿಯಗೊಳಿಸುವಲ್ಲಿ ಸಮಸ್ಯೆ"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index df42459..ac75777 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -106,12 +106,12 @@
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Memajukan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Dimatikan"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Pembawa anda tidak menyokong pelumpuhan pemajuan panggilan semasa telefon anda sibuk."</string>
-    <string name="labelCFNRy" msgid="1736067178393744351">"Jika tidak dijawab"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Semasa tidak dijawab"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nombor apabila tidak dijawab"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Memajukan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Dimatikan"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Pengendali anda tidak menyokong pelumpuhan pemajuan panggilan semasa telefon anda tidak menjawab."</string>
-    <string name="labelCFNRc" msgid="2614827454402079766">"Jika tidak dapat dihubungi"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Semasa tidak dapat dihubungi"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nombor apabila tidak dapat dihubungi"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Memajukan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Dilumpuhkan"</string>
@@ -197,8 +197,8 @@
     <string name="data_enabled" msgid="5972538663568715366">"Data didayakan"</string>
     <string name="data_enable_summary" msgid="2382798156640007971">"Benarkan penggunaan data"</string>
     <string name="roaming" msgid="8871412572928323707">"Perayauan data"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Sambung ke perkhidmatan data semasa perayauan"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Sambung ke perkhidmatan data semasa perayauan"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Sambung ke perkhidmatan data apabila melakukan perayauan"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Bersambung ke perkhidmatan data semasa melakukan perayauan"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Anda telah kehilangan kesambungan data kerana anda meninggalkan rangkaian rumah anda dengan data perayauan dimatikan."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Anda mungkin dikenakan caj yang tinggi."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Benarkan perayauan data?"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 2ae3e72..3e90906 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -145,7 +145,7 @@
     <string name="voicemail_default" msgid="2001233554889016880">"Operatøren din"</string>
     <string name="mobile_networks" msgid="2843854043339307375">"Mobilnettinnstillinger"</string>
     <string name="label_available" msgid="1181658289009300430">"Tilgjengelige nettverk"</string>
-    <string name="load_networks_progress" msgid="5230707536168902952">"Søker …"</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"Søker…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Fant ingen nettverk."</string>
     <string name="search_networks" msgid="1601136049300882441">"Søk etter nettverk"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Det oppsto en feil under søking etter nettverk."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ccfc7f9..2578abd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -88,7 +88,7 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Wczytywanie ustawień…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Ukrycie numeru podczas rozmów wychodzących"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numer wyświetlany w połączeniach wychodzących"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Do wyświetlania mojego numeru w połączeniach wychodzących używaj domyślnych ustawień operatora"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Użyj domyślnych ustawień operatora, aby wyświetlać mój numer w połączeniach wychodzących"</string>
     <string name="labelCW" msgid="6120513814915920200">"Połączenia oczekujące"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Podczas połączenia powiadamiaj mnie o połączeniach przychodzących"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Podczas połączenia powiadamiaj mnie o połączeniach przychodzących"</string>
@@ -142,7 +142,7 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nie można pobrać i zapisać bieżących ustawień numeru przekazywania.\nCzy mimo to przełączyć na nowego dostawcę?"</string>
     <string name="no_change" msgid="3186040086622435212">"Nie dokonano żadnych zmian."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Wybierz usługę poczty głosowej"</string>
-    <string name="voicemail_default" msgid="2001233554889016880">"Mój operator"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Twój operator"</string>
     <string name="mobile_networks" msgid="2843854043339307375">"Ustawienia sieci komórkowej"</string>
     <string name="label_available" msgid="1181658289009300430">"Dostępne sieci"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Wyszukiwanie..."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8f2cadf..6e28501 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -103,17 +103,17 @@
     <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desativado"</string>
     <string name="labelCFB" msgid="6139853033106283172">"Quando ocupado"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Número quando ocupado"</string>
-    <string name="sum_cfb_enabled" msgid="5984198104833116690">"Encaminhar para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfb_enabled" msgid="5984198104833116690">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Desativado"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Sua operadora não suporta a desativação do encaminhamento de chamada quando seu telefone está ocupado."</string>
     <string name="labelCFNRy" msgid="1736067178393744351">"Quando não atendido"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Número quando não atendido"</string>
-    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Encaminhar para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Desativado"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Sua operadora não suporta a desativação do encaminhamento de chamada quando seu telefone não responde."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"Quando inacessível"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número quando inacessível"</string>
-    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Encaminhar para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desativado"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Sua operadora não suporta a desativação do encaminhamento de chamada quando seu telefone não está acessível."</string>
     <string name="updating_title" msgid="6146755386174019046">"Configurações de chamadas"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c16e045..7b48b26 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -69,7 +69,7 @@
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Adăugați un cont SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurați setările contului"</string>
     <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Toate conturile pentru apelare"</string>
-    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selectați conturile care pot da apeluri"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selectați conturile care pot efectua apeluri"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Apelare prin Wi-Fi"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Serviciu de conectare încorporat"</string>
     <string name="voicemail" msgid="8693759337917898954">"Mesaj vocal"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8e6afb0..cbfb3f8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -88,10 +88,10 @@
     <string name="sum_loading_settings" msgid="1826692909391168620">"Загрузка настроек…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Скрывать номер при исходящих вызовах"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Номер, отображающийся при исходящих вызовах"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Использовать стандартные настройки оператора для показа моего номера при исходящих вызовах."</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Использовать стандартные настройки оператора для показа моего номера при исходящих вызовах"</string>
     <string name="labelCW" msgid="6120513814915920200">"Параллельный вызов"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Извещать меня о входящих вызовах во время разговора."</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Извещать меня о входящих вызовах во время разговора."</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="call_forwarding_settings_with_label" msgid="8569489414006897127">"Переадресация (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Переадресация вызовов"</string>
@@ -536,7 +536,7 @@
     <string name="description_dial_button" msgid="7459705245418435351">"набор номера"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибросигнал"</string>
-    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Визуальная голосовая почта"</string>
+    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Анимированная голосовая почта"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон и вибросигнал"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Встроенные SIM-карты"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index cc9cd02..35ffc3a 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -48,7 +48,7 @@
     <string name="puk_unlocked" msgid="2284912838477558454">"Karta jote SIM u zhbllokua. Telefoni yt po shkyçet..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN-i i shkyçjes së rrjetit të kartës SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Shkyçe"</string>
-    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Injoro"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Refuzo"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"Po kërkon shkyçjen e rrjetit…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Kërkesa për shkyçjen e rrjetit ishte e pasuksesshme."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Shkyçja e rrjetit ishte e suksesshme."</string>
@@ -515,7 +515,7 @@
     <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Modaliteti i \"Kthimit të telefonatës dalëse të urgjencës\""</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Po"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Jo"</string>
-    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Injoro"</string>
+    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Refuzo"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Shërbimi"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Konfigurimi"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;I pavendosur&gt;"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a63276c..b98f7a1 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -85,7 +85,7 @@
     <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>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Учитавање подешавања…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Број је скривен у одлазним позивима"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Број приказан у одлазним позивима"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Користи подразумевана подешавања оператера за приказивање мог броја у одлазним порукама"</string>
@@ -101,18 +101,18 @@
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Прослеђивање свих позива на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Број није доступан"</string>
     <string name="sum_cfu_disabled" msgid="8384177689501334080">"Искључено"</string>
-    <string name="labelCFB" msgid="6139853033106283172">"Кад је заузето"</string>
-    <string name="messageCFB" msgid="3711089705936187129">"Број кад је заузето"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Када је заузето"</string>
+    <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="4913145177320506827">"Искључено"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Оператер не подржава онемогућавање преусмеравања позива када је телефон заузет."</string>
-    <string name="labelCFNRy" msgid="1736067178393744351">"Кад се не јавите"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Број кад се не јавите"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Када се нисте јавили"</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="3884684060443538097">"Искључено"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Оператер не подржава онемогућавање преусмеравања позива када се на позив не одговори."</string>
-    <string name="labelCFNRc" msgid="2614827454402079766">"Када је недоступно"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"Број кад је недоступно"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Када сте недоступни"</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>
@@ -201,7 +201,7 @@
     <string name="roaming_disable" msgid="1843417228755568110">"Повезивање са услугом за податке током роминга"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Веза за пренос података је прекинута зато што сте напустили кућну мрежу са искљученим преносом података у ромингу."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Могу да настану значајни трошкови."</string>
-    <string name="roaming_alert_title" msgid="3654815360303826008">"Дозвољавате ли пренос података у ромингу?"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Желите ли да дозволите пренос података у ромингу?"</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>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6891808..ffa0958 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telepono"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Pang-emergency na Dialer"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telepono"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"List ng FDN"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"Listahan ng FDN"</string>
     <string name="unknown" msgid="6878797917991465859">"Di-kilala"</string>
     <string name="private_num" msgid="6713286113000232309">"Pribadong numero"</string>
     <string name="payphone" msgid="4793877574636445118">"Payphone"</string>
@@ -57,9 +57,9 @@
     <string name="labelGsmMore_with_label" msgid="2674012918829238901">"Mga setting ng tawag gamit ang GSM (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Mga setting ng CDMA na tawag"</string>
     <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Mga setting ng tawag gamit ang CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Mga Access Point Name"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Access Point Names"</string>
     <string name="settings_label" msgid="3876743539816984008">"Mga Setting ng Network"</string>
-    <string name="phone_accounts" msgid="6376603393888116364">"Account sa pagtawag"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Mga account sa pagtawag"</string>
     <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Tumawag gamit ang"</string>
     <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Tumawag sa pamamagitan ng SIP gamit ang"</string>
     <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Itanong muna"</string>
@@ -79,7 +79,7 @@
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Mga pang-emergency na broadcast"</string>
     <string name="call_settings" msgid="6112441768261754562">"Mga setting ng tawag"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Mga karagdagang setting"</string>
-    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Karagdagang setting (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Mga karagdagang setting (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Mga karagdagang setting ng tawag na GSM lang"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Mga karagdagang setting ng pagtawag sa CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Mga karagdagang setting ng tawag na CDMA lang"</string>
@@ -92,9 +92,9 @@
     <string name="labelCW" msgid="6120513814915920200">"Call waiting"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Habang nasa isang tawag, i-notify ako ng mga papasok na tawag"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Habang nasa isang tawag, i-notify ako ng mga papasok na tawag"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Setting ng pagpasa ng tawag"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Setting ng pagpasa ng tawag (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="labelCF" msgid="2574386948026924737">"Pagpapasa ng tawag"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Mga setting ng pagpapasa ng tawag"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Mga setting ng pagpapasa ng tawag (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="labelCF" msgid="2574386948026924737">"Pagpapasa ng Tawag"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Palaging ipasa"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Palaging gamitin ang numerong ito"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Ipinapasa ang lahat ng mga tawag"</string>
@@ -143,7 +143,7 @@
     <string name="no_change" msgid="3186040086622435212">"Walang ginawang mga pagbabago."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Piliin ang serbisyo ng voicemail"</string>
     <string name="voicemail_default" msgid="2001233554889016880">"Ang iyong carrier"</string>
-    <string name="mobile_networks" msgid="2843854043339307375">"Setting ng cellular network"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mga setting ng cellular network"</string>
     <string name="label_available" msgid="1181658289009300430">"Mga available na network"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Naghahanap…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Walang nakitang mga network."</string>
@@ -156,7 +156,7 @@
     <string name="sum_carrier_select" msgid="3494252551249882718">"Pumili ng network operator"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Hanapin ang lahat ng mga available na network"</string>
     <string name="select_automatically" msgid="5628402124471810174">"Awtomatikong pumili"</string>
-    <string name="sum_select_automatically" msgid="5614890115123292400">"Awtomatikong pumili ng gustong network"</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_summary" msgid="1434820673166126609">"Baguhin ang network operating mode"</string>
@@ -200,7 +200,7 @@
     <string name="roaming_enable" msgid="7331106985174381987">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Nawalan ka ng pagkonekta sa data dahil iniwan mo ang iyong home network na naka-off ang roaming ng data."</string>
-    <string name="roaming_warning" msgid="1603164667540144353">"Maaari kang magkaroon ng malaking bayarin."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Maaari kang magkaroon ng malalaking singil."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Payagan ang roaming ng data?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Mga pagpipilian sa GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Mga pagpipiliian sa CDMA"</string>
@@ -328,8 +328,8 @@
     <string name="carrier_settings_title" msgid="9028166176523012300">"Mga setting ng carrier"</string>
     <string name="fdn" msgid="7878832555095183202">"Mga Fixed Dialing Number"</string>
     <string name="fdn_with_label" msgid="187084204115493366">"Mga Fixed Dialing Number (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"List ng FDN"</string>
-    <string name="fdn_list_with_label" msgid="7437232552210469217">"List ng FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"Listahan ng FDN"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Listahan ng FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Pag-activate ng FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Pinagana ang Mga Fixed Dialing Number"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Naka-disable ang Mga Fixed Dialing Number"</string>
@@ -370,7 +370,7 @@
     <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 mga contact na i-import"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Piliin ang mga contact na ii-import"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"I-off ang airplane mode upang mag-import ng mga contact mula sa SIM card."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Paganahin/huwag paganahin ang PIN ng SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Baguhin ang PIN ng SIM"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 54fb904..0b74355 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -143,7 +143,7 @@
     <string name="no_change" msgid="3186040086622435212">"Не здійсн. жодних змін."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Вибер. службу голос. пошти"</string>
     <string name="voicemail_default" msgid="2001233554889016880">"Ваш оператор"</string>
-    <string name="mobile_networks" msgid="2843854043339307375">"Налаштування моб. мереж"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Налаштування мобільної мережі"</string>
     <string name="label_available" msgid="1181658289009300430">"Доступні мережі"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Пошук…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Не знайд. жодних мереж."</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 5130596..e09ad97 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -57,7 +57,7 @@
     <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM qo‘ng‘iroq sozlamalari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA qo‘ng‘iroq sozlamalari"</string>
     <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA qo‘ng‘iroq sozlamalari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Ulanish nuqtalari (APN)"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Ulanish nuqtasi nomlari"</string>
     <string name="settings_label" msgid="3876743539816984008">"Tarmoq sozlamalari"</string>
     <string name="phone_accounts" msgid="6376603393888116364">"Qo‘ng‘iroq hisoblari"</string>
     <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Qo‘ng‘iroqlar uchun hisob"</string>
@@ -125,7 +125,7 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Sozlamalar tiklanmoqda…"</string>
     <string name="response_error" msgid="6674110501330139405">"Tarmoqdan kutilmagan javob."</string>
     <string name="exception_error" msgid="7027667130619518211">"Tarmoq yoki SIM kartada xato."</string>
-    <string name="fdn_check_failure" msgid="18200614306525434">"Telefon ilovasidagi ruxsat etilgan raqamlar yoqildi. Endim ba’zi qo‘ng‘iroq funksiyalari ishlamay qoladi."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Telefoningiz ilovasining ruxsat berilgan raqamlar sozlamalari yoqildi. Natijada, ba’zi qo‘ng‘iroq qilish tegishli xususiyatlar ishlamaydi."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Ushbu sozlamalarni ko‘rishdan oldin radioni yoqing."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="7248657275000173526">"Yoqish"</string>
@@ -147,16 +147,16 @@
     <string name="label_available" msgid="1181658289009300430">"Mavjud tarmoqlar"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Qidirilmoqda…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Birorta ham tarmoq topilmadi."</string>
-    <string name="search_networks" msgid="1601136049300882441">"Tarmoqlarni qidirish"</string>
+    <string name="search_networks" msgid="1601136049300882441">"Tarmoqlarni izlash"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Tarmoqlar izlanayotganda xato."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g>da ro‘yxatdan o‘tmoqda…"</string>
     <string name="not_allowed" msgid="5613353860205691579">"SIM kartangiz ushbu tarmoqqa ulanishga ruxsat bermaydi."</string>
     <string name="connect_later" msgid="2308119155752343975">"Ushbu tarmoqqa hozirgi vaqtda ulanib bo‘lmaydi. Keyinroq urinib ko‘ring."</string>
     <string name="registration_done" msgid="495135664535876612">"Tarmoqda ro‘yxatdan o‘tgan."</string>
     <string name="sum_carrier_select" msgid="3494252551249882718">"Tarmoq operatorini tanlang"</string>
-    <string name="sum_search_networks" msgid="2921092249873272715">"Barcha mavjud tarmoqlarni qidirish"</string>
+    <string name="sum_search_networks" msgid="2921092249873272715">"Barcha mavjud tarmoqlarni izlash"</string>
     <string name="select_automatically" msgid="5628402124471810174">"Avtomatik tanlash"</string>
-    <string name="sum_select_automatically" msgid="5614890115123292400">"Afzal tarmoqni avtomatik tanlash"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Siz xohlagan tarmoqni avtomatik tanlash"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Avtomatik ro‘yxatdan o‘tish…"</string>
     <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tarmoq turi"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Tarmoq rejimini o‘zgartiring"</string>
@@ -196,11 +196,11 @@
     <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Ovozli va boshqa aloqalarni yaxshilash uchun LTE xizmatlaridan foydalaning"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Internet yoqildi"</string>
     <string name="data_enable_summary" msgid="2382798156640007971">"Mobil internetdan foydalanishga ruxsat"</string>
-    <string name="roaming" msgid="8871412572928323707">"Internet-rouming"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Rouming vaqtida mobil internetga ulanish"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Rouming vaqtida mobil internetga ulanish"</string>
+    <string name="roaming" msgid="8871412572928323707">"Ma’lumotlar roumingi"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Rouming holatda ma’lumot uzatish xizmatlariga ulanish"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Rouming holatda ma’lumot uzatish xizmatlariga ulanish"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Internetga ulanish uzildi, chunki uy tarmog‘ingizni rouming internetini o\'chirgan holatda tark etdingiz."</string>
-    <string name="roaming_warning" msgid="1603164667540144353">"Xarajati ancha yuqori bo‘lishi mumkin."</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Roumingdan foydalanish xarajati ancha yuqori bo‘lishi mumkin."</string>
     <string name="roaming_alert_title" msgid="3654815360303826008">"Internet-roumingga ruxsat berilsinmi?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS sozlamalari"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA sozlamalari"</string>
@@ -326,20 +326,20 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Qurilmani faollashtirish"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ma’lumot xizmatini o‘rnatish"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Tarmoq operatori sozlamalari"</string>
-    <string name="fdn" msgid="7878832555095183202">"Ruxsat etilgan raqamlar"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Ruxsat etilgan raqamlar (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"Ruxsat etilgan raqamlar"</string>
+    <string name="fdn" msgid="7878832555095183202">"O‘zgarmas chaqiruv raqamlari"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"O‘zgarmas chaqiruv raqamlari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"O‘zgarmas raqamlar"</string>
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Ruxsat etilgan raqamlar ro‘yxati (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDNni faollashtirish"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Ruxsat etilgan raqamlar yoqilgan"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Ruxsat etilgan raqamlar o‘chirib qo‘yilgan"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Ruxsat etilgan raqamlarni yoqish"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Ruxsat berilgan raqamlar yoqib qo‘yildi"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"O‘zgarmas chaqiruv raqamlari o‘chirib qo‘yilgan"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"FDNni yoqish"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"FDNni o‘chirib qo‘yish"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"PIN2-kodni o‘zgartirish"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"PIN2 kodni o‘zgartiring"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"FDNni o‘chirib qo‘yish"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Ruxsat etilgan raqamlarni yoqish"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Ruxsat etilgan raqamlarni boshqarish"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ruxsat etilgan raqamlar ro‘yxatiga kirish uchun PIN-kodni almashtiring"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"O‘zgarmas raqamlarni yoqish"</string>
+    <string name="sum_fdn" msgid="1959399454900272878">"Ruxsat berilgan raqamlarni boshqarish"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ruxsat etilgan raqamlar ro‘yxatiga kirish uchun PIN kodni almashtiring"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefon raqamlari ro‘yxatini boshqarish"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Shaxsiy ovoz"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Maxfiylikni kuchaytirish rejimini yoqish"</string>
@@ -364,33 +364,33 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Ruxsat berilgan raqamni o‘chirish"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Ruxsat berilgan raqamlar o‘chirilmoqda…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Ruxsat berilgan raqamlar o‘chirildi."</string>
-    <string name="pin2_invalid" msgid="5470854099230755944">"FDN yangilanmadi, chunki siz PIN-kodni noto‘g‘ri kiritdingiz."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN yangilanmadi, chunki siz noto‘g‘ri PIN kod kiritdingiz."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN yangilanmadi, chunki raqam 20 tadan oshmasligi kerak."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN yangilanmadi. PIN2 kodi xato yoki telefon raqami rad qilingan."</string>
     <string name="fdn_failed" msgid="540018079008319747">"FDN jarayoni amalga oshmadi."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM-kartadan o‘qilmoqda…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"SIM-kartada hech qanday kontakt yo‘q."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM kartadan o‘qilmoqda…"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartangizda kontaktlar yo‘q."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Import u-n kontaktlarni tanlang"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM kartadan kontaktlarni import qilish uchun parvoz rejimini o‘chiring"</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM-karta uchun PIN-kod so‘rovini yoqish/o‘chirish"</string>
     <string name="change_pin" msgid="9174186126330785343">"SIM-kartaning PIN-kodini o‘zgartirish"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"SIM-karta PIN kodi:"</string>
-    <string name="oldPinLabel" msgid="5287773661246368314">"Yangi PIN-kod"</string>
-    <string name="newPinLabel" msgid="207488227285336897">"Yangi PIN-kod"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"SIM karta PIN kodi:"</string>
+    <string name="oldPinLabel" msgid="5287773661246368314">"Yangi PIN kod"</string>
+    <string name="newPinLabel" msgid="207488227285336897">"Yangi PIN kod"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Yangi PIN kodni tasdiqlash"</string>
-    <string name="badPin" msgid="8955102849303984935">"Siz kiritgan eski PIN-kod xato. Yana urinib ko‘ring."</string>
+    <string name="badPin" msgid="8955102849303984935">"Siz kiritgan eski PIN kod xato. Yana urinib ko‘ring."</string>
     <string name="mismatchPin" msgid="5923253370683071889">"Siz yozgan PIN kodlar bir xil emas. Yana urinib ko‘ring."</string>
-    <string name="invalidPin" msgid="5981171102258684792">"PIN-kod raqamini 4 tadan 8 tagacha bo‘lgan miqdorda kiriting."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"PIN kod raqamini 4 tadan 8 tagacha bo‘lgan miqdorda kiriting."</string>
     <string name="disable_sim_pin" msgid="3419351358300716472">"SIM-karta uchun PIN-kod so‘rovini o‘chirish"</string>
-    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM kartaga PIN-kod o‘rnatish"</string>
-    <string name="enable_in_progress" msgid="3417917024688497010">"PIN-kod o‘rnatilmoqda…"</string>
-    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN-kod o‘rnatildi"</string>
-    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN-kod o‘chirildi"</string>
-    <string name="pin_failed" msgid="5644377896213584760">"PIN-kod noto‘g‘ri"</string>
-    <string name="pin_changed" msgid="4455736268023261662">"PIN-kod yangilandi"</string>
-    <string name="puk_requested" msgid="5921393215789090200">"Parol noto‘g‘ri. PIN-kod bloklandi. PUK kodni kiriting."</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM kartaga PIN kod o‘rnatish"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN kod o‘rnatilmoqda…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN kod o‘rnatildi"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN kod o‘chirildi"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN kod noto‘g‘ri"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN kod yangilandi"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Parol noto‘g‘ri. PIN kod bloklandi. PUK kodni kiriting."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"Eski PIN2"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"Eski PIN2 kod"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Yangi PIN2 kodi"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Yangi PIN2 kodni tasdiqlash"</string>
     <string name="badPuk2" msgid="7910064009531541708">"PUK2 kodi noto‘g‘ri. Qaytadan urining."</string>
@@ -401,7 +401,7 @@
     <string name="pin2_changed" msgid="3724522579945610956">"PIN2 kodi yangilandi"</string>
     <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 kodini kiriting"</string>
     <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Parol noto‘g‘ri. PIN2 kodi bloklandi. Qaytadan urinish uchun PIN2 kodini o‘zgartiring."</string>
-    <string name="puk2_requested" msgid="5831015200030161434">"Parol noto‘g‘ri. SIM-karta qulflandi. PUK2 kodini kiriting."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Parol noto‘g‘ri. SIM karta qulflandi. PUK2 kodini kiriting."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kod butunlay to‘sib qo‘yildi."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Sizda <xliff:g id="NUMBER">%d</xliff:g> ta urinish qoldi."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 kodi blokdan chiqarildi"</string>
@@ -457,7 +457,7 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Video qo‘ng‘iroq"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"Import qilish"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"Barchasini import qilish"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"SIM-karta kontaktlarini import qilish"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"SIM karta kontaktlarini import qilish"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Kontaktlardan import qilish"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Eshitish qurilmalari"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Eshitish qurilmalari bilan ishlash xusisiyatini yoqish"</string>
@@ -538,7 +538,7 @@
     <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Yopish"</string>
     <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Favqulodda qo‘ng‘iroqlar"</string>
     <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Faqat favqulodda qo‘ng‘iroqlar"</string>
-    <string name="sim_description_default" msgid="4778679519938775515">"SIM-karta, teshik: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM karta, teshik: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
     <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Maxsus imkoniyatlar"</string>
     <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Kiruvchi Wi-Fi qo‘ng‘irog‘i"</string>
     <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi qo‘ng‘irog‘i"</string>
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d6216c5..fb736fa 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2696,7 +2696,7 @@
      * {@hide}
      * Returns the IMS Registration Status
      */
-    public boolean isWifiCallingEnabled() {
+    public boolean isWifiCallingAvailable() {
         return mPhone.isWifiCallingEnabled();
     }
 
@@ -2704,10 +2704,17 @@
      * {@hide}
      * Returns the IMS Registration Status
      */
-    public boolean isVolteEnabled() {
+    public boolean isVolteAvailable() {
         return mPhone.isVolteEnabled();
     }
 
+    /*
+     * {@hide} Returns the IMS Registration Status
+     */
+    public boolean isVideoTelephonyAvailable() {
+        return mPhone.isVideoEnabled();
+    }
+
     private boolean canReadPhoneState(String callingPackage, String message) {
         try {
             mApp.enforceCallingOrSelfPermission(
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 6c4f48e..02b6e99 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -32,6 +32,7 @@
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.imsphone.ImsPhoneConnection;
 import com.android.phone.PhoneUtils;
 import com.android.phone.R;
@@ -601,6 +602,7 @@
 
         participant.removeConnectionListener(mParticipantListener);
         mConferenceParticipantConnections.remove(participant.getUserEntity());
+        mTelephonyConnectionService.removeConnection(participant);
     }
 
     /**
@@ -648,7 +650,12 @@
 
             PhoneAccountHandle phoneAccountHandle =
                     PhoneUtils.makePstnPhoneAccountHandle(mConferenceHost.getPhone());
-            mTelephonyConnectionService.addExistingConnection(phoneAccountHandle, mConferenceHost);
+            if (mConferenceHost.getPhone().getPhoneType() == PhoneConstants.PHONE_TYPE_GSM) {
+                GsmConnection c = new GsmConnection(originalConnection);
+                c.updateState();
+                mTelephonyConnectionService.addExistingConnection(phoneAccountHandle, c);
+                mTelephonyConnectionService.addConnectionToConferenceController(c);
+            } // CDMA case not applicable for SRVCC
             mConferenceHost.removeConnectionListener(mConferenceHostListener);
             mConferenceHost.removeTelephonyConnectionListener(mTelephonyConnectionListener);
             mConferenceHost = null;
diff --git a/src/com/android/services/telephony/TelephonyConferenceController.java b/src/com/android/services/telephony/TelephonyConferenceController.java
index 2af10a6..93b94aa 100644
--- a/src/com/android/services/telephony/TelephonyConferenceController.java
+++ b/src/com/android/services/telephony/TelephonyConferenceController.java
@@ -17,6 +17,7 @@
 package com.android.services.telephony;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -29,6 +30,7 @@
 import android.telecom.Connection;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccountHandle;
+import com.android.phone.PhoneUtils;
 
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.gsm.GsmConnection;
@@ -46,6 +48,8 @@
     private final Connection.Listener mConnectionListener = new Connection.Listener() {
         @Override
         public void onStateChanged(Connection c, int state) {
+            Log.v(this, "onStateChange triggered in Conf Controller : connection = "+ c
+                 + " state = " + state);
             recalculate();
         }
 
@@ -65,6 +69,7 @@
     private final List<TelephonyConnection> mTelephonyConnections = new ArrayList<>();
 
     private final TelephonyConnectionService mConnectionService;
+    private boolean mTriggerRecalculate = false;
 
     public TelephonyConferenceController(TelephonyConnectionService connectionService) {
         mConnectionService = connectionService;
@@ -73,6 +78,11 @@
     /** The TelephonyConference connection object. */
     private TelephonyConference mTelephonyConference;
 
+    boolean shouldRecalculate() {
+        Log.d(this, "shouldRecalculate is " + mTriggerRecalculate);
+        return mTriggerRecalculate;
+    }
+
     void add(TelephonyConnection connection) {
         mTelephonyConnections.add(connection);
         connection.addConnectionListener(mConnectionListener);
@@ -82,11 +92,10 @@
     void remove(Connection connection) {
         connection.removeConnectionListener(mConnectionListener);
         mTelephonyConnections.remove(connection);
-
         recalculate();
     }
 
-    private void recalculate() {
+    void recalculate() {
         recalculateConference();
         recalculateConferenceable();
     }
@@ -183,6 +192,21 @@
         Log.d(this, "Recalculate conference calls %s %s.",
                 mTelephonyConference, conferencedConnections);
 
+        // Check if all conferenced connections are in Connection Service
+        boolean allConnInService = true;
+        Collection<Connection> allConnections = mConnectionService.getAllConnections();
+        for (Connection connection : conferencedConnections) {
+            Log.v (this, "Finding connection in Connection Service for " + connection);
+            if (!allConnections.contains(connection)) {
+                allConnInService = false;
+                Log.v(this, "Finding connection in Connection Service Failed");
+                break;
+            }
+        }
+
+        Log.d(this, "Is there a match for all connections in connection service " +
+            allConnInService);
+
         // If this is a GSM conference and the number of connections drops below 2, we will
         // terminate the conference.
         if (numGsmConnections < 2) {
@@ -204,35 +228,47 @@
                         mTelephonyConference.removeConnection(connection);
                     }
                 }
-
-                // Add any new ones
-                for (Connection connection : conferencedConnections) {
-                    if (!existingConnections.contains(connection)) {
-                        mTelephonyConference.addConnection(connection);
+                if (allConnInService) {
+                    mTriggerRecalculate = false;
+                    // Add any new ones
+                    for (Connection connection : conferencedConnections) {
+                        if (!existingConnections.contains(connection)) {
+                            mTelephonyConference.addConnection(connection);
+                        }
                     }
+                } else {
+                    Log.d(this, "Trigger recalculate later");
+                    mTriggerRecalculate = true;
                 }
             } else {
-                mTelephonyConference = new TelephonyConference(null);
-
-                for (Connection connection : conferencedConnections) {
-                    Log.d(this, "Adding a connection to a conference call: %s %s",
-                            mTelephonyConference, connection);
-                    mTelephonyConference.addConnection(connection);
+                if (allConnInService) {
+                    mTriggerRecalculate = false;
+                    mTelephonyConference = new TelephonyConference(null);
+                    for (Connection connection : conferencedConnections) {
+                        Log.d(this, "Adding a connection to a conference call: %s %s",
+                                mTelephonyConference, connection);
+                        mTelephonyConference.addConnection(connection);
+                    }
+                    mConnectionService.addConference(mTelephonyConference);
+                } else {
+                    Log.d(this, "Trigger recalculate later");
+                    mTriggerRecalculate = true;
                 }
-
-                mConnectionService.addConference(mTelephonyConference);
             }
-
-            // Set the conference state to the same state as its child connections.
-            Connection conferencedConnection = mTelephonyConference.getPrimaryConnection();
-            if (conferencedConnection != null) {
-                switch (conferencedConnection.getState()) {
-                    case Connection.STATE_ACTIVE:
-                        mTelephonyConference.setActive();
-                        break;
-                    case Connection.STATE_HOLDING:
-                        mTelephonyConference.setOnHold();
-                        break;
+            if (mTelephonyConference != null) {
+                Connection conferencedConnection = mTelephonyConference.getPrimaryConnection();
+                Log.v(this, "Primary Conferenced connection is " + conferencedConnection);
+                if (conferencedConnection != null) {
+                    switch (conferencedConnection.getState()) {
+                        case Connection.STATE_ACTIVE:
+                            Log.v(this, "Setting conference to active");
+                            mTelephonyConference.setActive();
+                            break;
+                        case Connection.STATE_HOLDING:
+                            Log.v(this, "Setting conference to hold");
+                            mTelephonyConference.setOnHold();
+                            break;
+                    }
                 }
             }
         }
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 8c09a95..be90177 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -21,6 +21,7 @@
 import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.os.AsyncResult;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.telecom.CallAudioState;
@@ -32,11 +33,15 @@
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.Connection.PostDialListener;
+import com.android.internal.telephony.gsm.SuppServiceNotification;
+
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.imsphone.ImsPhoneConnection;
 import com.android.phone.R;
 
 import java.lang.Override;
+import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -53,6 +58,8 @@
     private static final int MSG_DISCONNECT = 4;
     private static final int MSG_MULTIPARTY_STATE_CHANGED = 5;
     private static final int MSG_CONFERENCE_MERGE_FAILED = 6;
+    private static final int MSG_SUPP_SERVICE_NOTIFY = 7;
+    private SuppServiceNotification mSsNotification = null;
 
     private final Handler mHandler = new Handler() {
         @Override
@@ -70,7 +77,7 @@
                     if ((connection.getAddress() != null &&
                                     mOriginalConnection.getAddress() != null &&
                             mOriginalConnection.getAddress().contains(connection.getAddress())) ||
-                            connection.getStateBeforeHandover() == mOriginalConnection.getState()) {
+                            mOriginalConnection.getStateBeforeHandover() == connection.getState()) {
                         Log.d(TelephonyConnection.this, "SettingOriginalConnection " +
                                 mOriginalConnection.toString() + " with " + connection.toString());
                         setOriginalConnection(connection);
@@ -101,6 +108,24 @@
                 case MSG_CONFERENCE_MERGE_FAILED:
                     notifyConferenceMergeFailed();
                     break;
+                case MSG_SUPP_SERVICE_NOTIFY:
+                    Log.v(TelephonyConnection.this, "MSG_SUPP_SERVICE_NOTIFY on phoneId : "
+                            +getPhone().getPhoneId());
+                    if (msg.obj != null && ((AsyncResult) msg.obj).result != null) {
+                        mSsNotification =
+                                (SuppServiceNotification)((AsyncResult) msg.obj).result;
+                        if (mOriginalConnection != null && mSsNotification.history != null) {
+                            Bundle extras = mOriginalConnection.getExtras();
+                            if (extras != null) {
+                                Log.v(TelephonyConnection.this,
+                                        "Updating call history info in extras.");
+                                extras.putStringArrayList(EXTRA_CALL_HISTORY_INFO,
+                                        new ArrayList(Arrays.asList(mSsNotification.history)));
+                                setExtras(extras);
+                            }
+                        }
+                    }
+                    break;
             }
         }
     };
@@ -229,6 +254,7 @@
 
     private com.android.internal.telephony.Connection mOriginalConnection;
     private Call.State mOriginalConnectionState = Call.State.IDLE;
+    private Bundle mOriginalConnectionExtras = new Bundle();
 
     private boolean mWasImsConnection;
 
@@ -555,6 +581,7 @@
                 mHandler, MSG_HANDOVER_STATE_CHANGED, null);
         getPhone().registerForRingbackTone(mHandler, MSG_RINGBACK_TONE, null);
         getPhone().registerForDisconnect(mHandler, MSG_DISCONNECT, null);
+        getPhone().registerForSuppServiceNotification(mHandler, MSG_SUPP_SERVICE_NOTIFY, null);
         mOriginalConnection.addPostDialListener(mPostDialListener);
         mOriginalConnection.addListener(mOriginalConnectionListener);
 
@@ -585,6 +612,7 @@
             getPhone().unregisterForRingbackTone(mHandler);
             getPhone().unregisterForHandoverStateChanged(mHandler);
             getPhone().unregisterForDisconnect(mHandler);
+            getPhone().unregisterForSuppServiceNotification(mHandler);
             mOriginalConnection = null;
         }
     }
@@ -696,6 +724,55 @@
         return true;
     }
 
+    protected void updateExtras() {
+        Bundle extras = null;
+        if (mOriginalConnection != null) {
+            extras = mOriginalConnection.getExtras();
+            if (extras != null) {
+                // Check if extras have changed and need updating.
+                if (!areBundlesEqual(mOriginalConnectionExtras, extras)) {
+                    if (Log.DEBUG) {
+                        Log.d(TelephonyConnection.this, "Updating extras:");
+                        for (String key : extras.keySet()) {
+                            Object value = extras.get(key);
+                            if (value instanceof String) {
+                                Log.d(this, "updateExtras Key=" + Log.pii(key) +
+                                             " value=" + Log.pii((String)value));
+                            }
+                        }
+                    }
+                    mOriginalConnectionExtras.clear();
+                    mOriginalConnectionExtras.putAll(extras);
+                } else {
+                    Log.d(this, "Extras update not required");
+                }
+            } else {
+                Log.d(this, "updateExtras extras: " + Log.pii(extras));
+            }
+        }
+    }
+
+    private static boolean areBundlesEqual(Bundle extras, Bundle newExtras) {
+        if (extras == null || newExtras == null) {
+            return extras == newExtras;
+        }
+
+        if (extras.size() != newExtras.size()) {
+            return false;
+        }
+
+        for(String key : extras.keySet()) {
+            if (key != null) {
+                final Object value = extras.get(key);
+                final Object newValue = newExtras.get(key);
+                if (!Objects.equals(value, newValue)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
     void updateState() {
         if (mOriginalConnection == null) {
             return;
@@ -736,6 +813,7 @@
         updateConnectionCapabilities();
         updateAddress();
         updateMultiparty();
+        updateExtras();
     }
 
     /**
@@ -813,6 +891,7 @@
             getPhone().unregisterForPreciseCallStateChanged(mHandler);
             getPhone().unregisterForRingbackTone(mHandler);
             getPhone().unregisterForHandoverStateChanged(mHandler);
+            getPhone().unregisterForSuppServiceNotification(mHandler);
         }
         mOriginalConnection = null;
         destroy();
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 72c9b07..3898a6b 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -303,6 +303,13 @@
     }
 
     @Override
+    public void triggerConferenceRecalculate() {
+        if (mTelephonyConferenceController.shouldRecalculate()) {
+            mTelephonyConferenceController.recalculate();
+        }
+    }
+
+    @Override
     public Connection onCreateUnknownConnection(PhoneAccountHandle connectionManagerPhoneAccount,
             ConnectionRequest request) {
         Log.i(this, "onCreateUnknownConnection, request: " + request);
@@ -321,9 +328,16 @@
             allConnections.addAll(ringingCall.getConnections());
         }
         final Call foregroundCall = phone.getForegroundCall();
-        if (foregroundCall.hasConnections()) {
+        if ((foregroundCall.getState() != Call.State.DISCONNECTED)
+                && (foregroundCall.hasConnections())) {
             allConnections.addAll(foregroundCall.getConnections());
         }
+        if (phone.getImsPhone() != null) {
+            final Call imsFgCall = phone.getImsPhone().getForegroundCall();
+            if ((imsFgCall.getState() != Call.State.DISCONNECTED) && imsFgCall.hasConnections()) {
+                allConnections.addAll(imsFgCall.getConnections());
+            }
+        }
         final Call backgroundCall = phone.getBackgroundCall();
         if (backgroundCall.hasConnections()) {
             allConnections.addAll(phone.getBackgroundCall().getConnections());
@@ -333,6 +347,7 @@
         for (com.android.internal.telephony.Connection telephonyConnection : allConnections) {
             if (!isOriginalConnectionKnown(telephonyConnection)) {
                 unknownConnection = telephonyConnection;
+                Log.d(this, "onCreateUnknownConnection: conn = " + unknownConnection);
                 break;
             }
         }