Merge "Don't use the legacy phone picker" into mnc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cddbc1a..2395cd1 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -81,6 +81,7 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+ <uses-permission android:name="android.permission.ACCESS_IMS_CALL_SERVICE" />
<uses-permission android:name="android.permission.DEVICE_POWER" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<uses-permission android:name="android.permission.INTERNET" />
@@ -122,6 +123,7 @@
<uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL" />
<uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
<uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
+ <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
<!-- This tells the activity manager to not delay any of our activity
@@ -535,7 +537,7 @@
android:theme="@android:style/Theme.NoDisplay"
android:excludeFromRecents="true">
<intent-filter>
- <action android:name="android.telecom.action.CONNECTION_SERVICE_CONFIGURE" />
+ <action android:name="android.telecom.action.CONFIGURE_PHONE_ACCOUNT" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
@@ -598,6 +600,10 @@
<action android:name="com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <intent-filter>
+ <action android:name="android.telephony.action.CONFIGURE_VOICEMAIL" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
</activity>
<!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
diff --git a/res/layout/sim_ndp.xml b/res/layout/sim_ndp.xml
index 5e98cff..5e3c472 100644
--- a/res/layout/sim_ndp.xml
+++ b/res/layout/sim_ndp.xml
@@ -51,7 +51,7 @@
android:paddingEnd="20dip" />
<!-- Dismiss button. (Not present in some products; see
- sim_network_unlock_allow_dismiss in config.xml.) -->
+ CarrierConfigManager#KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL) -->
<Button android:id="@+id/ndp_dismiss"
android:layout_gravity="center_horizontal"
android:text="@string/sim_ndp_dismiss_text"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 1790f77..df5a095 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -548,5 +548,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-oproep"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Raak weer om oop te maak"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Kon nie die boodskap dekodeer nie."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"\'n SIM-kaart het jou diens geaktiveer en jou foon se swerwingvermoëns opgedateer."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"\'n SIM-kaart het jou diens geaktiveer en jou foon se swerwingvermoëns opgedateer."</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8ec97d6..a6995b0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"የWi-Fi ጥሪ"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"ለመክፈት ዳግም ይንኩ"</string>
<string name="message_decode_error" msgid="3456481534066924855">"መልዕክቱን በማመሳጠር ላይ ስህተት ነበር።"</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"አንድ ሲም ካርድ አገልግሎትዎን ገቢር አድርጎታል፣ እንዲሁም የስልክዎን የማስተላለፍ ችሎታዎችን አዘምኗል።"</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"አንድ ሲም ካርድ አገልግሎትዎን ገቢር አድርጎታል፣ እንዲሁም የስልክዎን የማስተላለፍ ችሎታዎችን አዘምኗል።"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index be40501..3475462 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -556,5 +556,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"مكالمة عبر Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"المس مرة أخرى للفتح"</string>
<string name="message_decode_error" msgid="3456481534066924855">"حدث خطأ أثناء فك ترميز الرسالة."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"نشطّت شريحة SIM خدمتك وحدّثت إمكانات التجوال لهاتفك."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"نشطت شريحة SIM خدمتك وحدّثت إمكانات التجوال لهاتفك."</string>
</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 306473a..c7c3f20 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi zəng"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Yenidən açmaq üçün toxunun"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Mesaj dekod edilən zaman xəta oldu."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM kart xidmətinizi aktivləşdirdi və telefonunuzun rominq imkanlarını güncəllədi."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM kart xidmətinizi aktivləşdirdi və telefonunuzun rominq imkanlarını güncəlləşdi."</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c28a662..d9a68b0 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>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Обаждане през Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Докоснете отново за отваряне"</string>
<string name="message_decode_error" msgid="3456481534066924855">"При декодирането на съобщението възникна грешка."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM картата е активирала клетъчните ви услуги и е актуализирала възможностите за роуминг на телефона ви."</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index a3aead0..737817f 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">"সিম নেটওয়ার্ক আনলক PIN"</string>
+ <string name="label_ndp" msgid="780479633159517250">"সিম নেটওয়ার্ক আনলক পিন"</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>
@@ -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>
@@ -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 অ্যাক্সেসের জন্য PIN পরিবর্তন করুন"</string>
+ <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN অ্যাক্সেসের জন্য পিন পরিবর্তন করুন"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"ফোন নম্বরের তালিকা পরিচালনা করুন"</string>
<string name="voice_privacy" msgid="3776841382844614716">"ভয়েস গোপনীয়তা"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"উন্নত গোপনীয়তা মোড সক্ষম করুন"</string>
@@ -364,31 +364,31 @@
<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">"আপনি একটি ভুল PIN টাইপ করায় FDN আপডেট করা হয়নি৷"</string>
+ <string name="pin2_invalid" msgid="5470854099230755944">"আপনি একটি ভুল পিন টাইপ করায় 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>
<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">"SIM কার্ডটি থেকে পরিচিতিগুলি আমদানি করতে বিমান মোড বন্ধ করুন৷"</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="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="confirmPinLabel" msgid="257597715098070206">"নতুন PINটি নিশ্চিত করুন"</string>
- <string name="badPin" msgid="8955102849303984935">"আপনার দ্বারা টাইপ করা পুরানো PIN সঠিক নয়৷ আবার চেষ্টা করুন৷"</string>
+ <string name="badPin" msgid="8955102849303984935">"আপনার দ্বারা টাইপ করা পুরানো পিন সঠিক নয়৷ আবার চেষ্টা করুন৷"</string>
<string name="mismatchPin" msgid="5923253370683071889">"আপনার টাইপ করা PINগুলি মিলছে না৷ আবার চেষ্টা করুন৷"</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="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="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">"পাসওয়ার্ডটি ভুল৷ PIN2 এখন অবরুদ্ধ৷ আবার চেষ্টা করতে, PIN 2 পরিবর্তন করুন৷"</string>
+ <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"পাসওয়ার্ডটি ভুল৷ পিন2 এখন অবরুদ্ধ৷ আবার চেষ্টা করতে, পিন 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>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi কল"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"খোলার জন্য আবার স্পর্শ করুন"</string>
<string name="message_decode_error" msgid="3456481534066924855">"বার্তাটি ডিকোড করার সময় একটি ত্রুটি ঘটেছে৷"</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"একটি SIM কার্ড আপনার পরিষেবা সক্রিয় করেছে এবং আপনার ফোনের রোমিং ক্ষমতা আপডেট করা হয়েছে৷"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 67b425c..63a627a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -48,7 +48,7 @@
<string name="puk_unlocked" msgid="2284912838477558454">"La targeta SIM s\'ha desbloquejat. El telèfon s\'està desbloquejant..."</string>
<string name="label_ndp" msgid="780479633159517250">"PIN de desbloqueig de xarxa SIM"</string>
<string name="sim_ndp_unlock_text" msgid="683628237760543009">"Desbloqueja"</string>
- <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Omet"</string>
+ <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Ignora"</string>
<string name="requesting_unlock" msgid="6412629401033249351">"S\'està sol·licitant el desbloqueig de la xarxa..."</string>
<string name="unlock_failed" msgid="6490531697031504225">"Sol·licitud de desbloqueig de xarxa incorrecta."</string>
<string name="unlock_success" msgid="6770085622238180152">"Desbloqueig de la xarxa correcte."</string>
@@ -515,7 +515,7 @@
<string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"S\'està sortint del mode de devolució de trucades d\'emergència"</string>
<string name="alert_dialog_yes" msgid="6674268047820703974">"Sí"</string>
<string name="alert_dialog_no" msgid="1476091437797628703">"No"</string>
- <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Omet"</string>
+ <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Ignora"</string>
<string name="voicemail_provider" msgid="5135942703327136909">"Servei"</string>
<string name="voicemail_settings" msgid="72448049107749316">"Configuració"</string>
<string name="voicemail_number_not_set" msgid="6724904736891087856">"<No definit>"</string>
@@ -528,7 +528,7 @@
<string name="description_dial_button" msgid="7459705245418435351">"marca"</string>
<string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibra"</string>
<string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibra"</string>
- <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Bústia de veu de Visual"</string>
+ <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Bústia de veu visual"</string>
<string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"So"</string>
<string name="preference_category_ringtone" msgid="5197960752529332721">"So i vibració"</string>
<string name="pstn_connection_service_label" msgid="1743245930577325900">"Targetes SIM integrades"</string>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Trucada per Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Toca-ho de nou per obrir"</string>
<string name="message_decode_error" msgid="3456481534066924855">"S\'ha produït un error en descodificar el missatge."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Una targeta SIM ha activat el servei, i s\'ha actualitzat la funció d\'itinerància del telèfon."</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3ce09d3..0b4b8ca 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -130,7 +130,7 @@
<string name="close_dialog" msgid="2365884406356986917">"OK"</string>
<string name="enable" msgid="7248657275000173526">"Zapnout"</string>
<string name="disable" msgid="4678348128118573672">"Vypnout"</string>
- <string name="change_num" msgid="239476305819844391">"Aktualizovat"</string>
+ <string name="change_num" msgid="239476305819844391">"Aktualiz."</string>
<string-array name="clir_display_values">
<item msgid="5560134294467334594">"Výchozí nastavení sítě"</item>
<item msgid="7876195870037833661">"Skrýt číslo"</item>
@@ -329,7 +329,7 @@
<string name="fdn" msgid="7878832555095183202">"Povolená tel. čísla"</string>
<string name="fdn_with_label" msgid="187084204115493366">"Povolená tel. čísla (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"Seznam povolených telefonních čísel"</string>
- <string name="fdn_list_with_label" msgid="7437232552210469217">"Seznam povolených telefonních čísel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_list_with_label" msgid="7437232552210469217">"Povolená čísla (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"Aktivace povolených telefonních čísel"</string>
<string name="fdn_enabled" msgid="5238109009915521240">"Funkce Povolená tel. čísla je zapnuta"</string>
<string name="fdn_disabled" msgid="4700049736675368279">"Funkce Povolená tel. čísla je vypnuta"</string>
@@ -550,6 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Volání přes Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Otevřete opětovným klepnutím"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Při dekódování zprávy došlo k chybě."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM karta aktivovala vaši službu a byly aktualizovány roamingové možnosti telefonu."</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a3763d1..59c2644 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -52,7 +52,7 @@
<string name="requesting_unlock" msgid="6412629401033249351">"Anmoder om oplåsning af netværk ..."</string>
<string name="unlock_failed" msgid="6490531697031504225">"Anmodningen om oplåsning af netværk mislykkedes."</string>
<string name="unlock_success" msgid="6770085622238180152">"Netværket blev låst op."</string>
- <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Denne bruger har ikke adgang til mobilnetværksindstillinger"</string>
+ <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Denne bruger har ikke adgang til indstillingerne for mobilnetværk"</string>
<string name="labelGSMMore" msgid="5930842194056092106">"Indstillinger for GSM-opkald"</string>
<string name="labelGsmMore_with_label" msgid="2674012918829238901">"Indstillinger for GSM-opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCDMAMore" msgid="1630676740428229339">"Indstillinger for CDMA-opkald"</string>
@@ -73,7 +73,7 @@
<string name="wifi_calling" msgid="739018212480165598">"Opkald via Wi-Fi"</string>
<string name="connection_service_default_label" msgid="1498481943805913754">"Indbygget forbindelsestjeneste"</string>
<string name="voicemail" msgid="8693759337917898954">"Telefonsvarer"</string>
- <string name="voicemail_settings_with_label" msgid="152724978380748296">"Talebesked (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="voicemail_settings_with_label" msgid="152724978380748296">"Telefonsvarer (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
<string name="networks" msgid="8873030692174541976">"Netværksudbydere"</string>
<string name="cell_broadcast_settings" msgid="8740238216690502563">"Nødudsendelser"</string>
@@ -143,7 +143,7 @@
<string name="no_change" msgid="3186040086622435212">"Der blev ikke foretaget nogen ændringer."</string>
<string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Vælg telefonsvarertjeneste"</string>
<string name="voicemail_default" msgid="2001233554889016880">"Dit mobilselskab"</string>
- <string name="mobile_networks" msgid="2843854043339307375">"Mobilnetværksindstillinger"</string>
+ <string name="mobile_networks" msgid="2843854043339307375">"Indstillinger for mobilnetværk"</string>
<string name="label_available" msgid="1181658289009300430">"Tilgængelige netværk"</string>
<string name="load_networks_progress" msgid="5230707536168902952">"Søger..."</string>
<string name="empty_networks_list" msgid="4249426905018815316">"Der blev ikke fundet nogen netværk."</string>
@@ -544,11 +544,11 @@
<string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Luk"</string>
<string name="sim_label_emergency_calls" msgid="4847699229529306397">"Nødopkald"</string>
<string name="sim_description_emergency_calls" msgid="7535215397212301562">"Kun nødopkald"</string>
- <string name="sim_description_default" msgid="4778679519938775515">"SIM-kortholder: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+ <string name="sim_description_default" msgid="4778679519938775515">"SIM-kortrille: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
<string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Hjælpefunktioner"</string>
<string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Indgående Wi-Fi-opkald"</string>
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-opkald"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tryk igen for at åbne"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Der opstod en fejl under afkodning af beskeden."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Et SIM-kort har aktiveret din tjeneste og opdateret telefonens muligheder for roaming."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Et SIM-kort har aktiveret din tjeneste og opdateret telefonens roamingmuligheder."</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1321682..5e3b9b1 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -548,5 +548,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"WLAN-Anruf"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Zum Öffnen erneut berühren"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Beim Entschlüsseln der Nachricht ist ein Fehler aufgetreten."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Eine SIM-Karte hat Ihren Dienst aktiviert und die Roamingfunktionen Ihres Smartphones aktualisiert."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Eine SIM-Karte hat Ihren Dienst aktiviert und die Roamingfunktionen Ihres Smartphones aktualisiert."</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 88df7ce..676fe4e 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>
@@ -98,22 +98,22 @@
<string name="labelCFU" msgid="8147177368148660600">"Προώθηση πάντα"</string>
<string name="messageCFU" msgid="3560082430662923687">"Να γίνεται πάντα χρήση αυτού του αριθμού"</string>
<string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Προώθηση όλων των κλήσεων"</string>
- <string name="sum_cfu_enabled" msgid="2450052502198827927">"Προώθηση όλων των κλήσεων προς <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+ <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="sum_cfb_enabled" msgid="5984198104833116690">"Προώθηση προς <xliff:g id="PHONENUMBER">{0}</xliff:g>"</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="sum_cfnry_enabled" msgid="6955775691317662910">"Προώθηση προς <xliff:g id="PHONENUMBER">{0}</xliff:g>"</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="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_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="updating_title" msgid="6146755386174019046">"Ρυθμίσεις κλήσης"</string>
@@ -142,8 +142,8 @@
<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="mobile_networks" msgid="2843854043339307375">"Ρυθμίσεις δικτύου κινητής τηλεφωνίας"</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>
<string name="empty_networks_list" msgid="4249426905018815316">"Δεν βρέθηκαν δίκτυα."</string>
@@ -528,7 +528,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>
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Κλήση μέσω Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Αγγίξτε ξανά για άνοιγμα"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Παρουσιάστηκε κάποιο σφάλμα κατά την αποκωδικοποίηση του μηνύματος."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Μια κάρτα SIM ενεργοποίησε την υπηρεσία σας και ενημέρωσε τις δυνατότητες περιαγωγής του τηλεφώνου σας."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Μια κάρτα SIM ενεργοποίησε την υπηρεσία σας και ενημέρωσε τις δυνατότητες περιαγωγής του τηλεφώνου σας."</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 6a1bbad..79ab030 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi call"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Touch again to open"</string>
<string name="message_decode_error" msgid="3456481534066924855">"There was an error while decoding the message."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"A SIM card has activated your service and updated your phone\'s roaming capabilities."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"A SIM card has activated your service and updated your phone\'s roaming capabilities."</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6a1bbad..79ab030 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi call"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Touch again to open"</string>
<string name="message_decode_error" msgid="3456481534066924855">"There was an error while decoding the message."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"A SIM card has activated your service and updated your phone\'s roaming capabilities."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"A SIM card has activated your service and updated your phone\'s roaming capabilities."</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6a1bbad..79ab030 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi call"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Touch again to open"</string>
<string name="message_decode_error" msgid="3456481534066924855">"There was an error while decoding the message."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"A SIM card has activated your service and updated your phone\'s roaming capabilities."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"A SIM card has activated your service and updated your phone\'s roaming capabilities."</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ec8f845..92384c1 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 alcanzar"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se puede establecer la llamada"</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>
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Llamada por Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Vuelve a tocar para realizar la acción."</string>
<string name="message_decode_error" msgid="3456481534066924855">"Se produjo un error al decodificar el mensaje."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Una tarjeta SIM activó tu servicio y actualizó las capacidades de roaming del teléfono."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Una tarjeta SIM activó tu servicio y actualizó las capacidades de roaming del teléfono."</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5ca4ac1..daa2dae 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -378,7 +378,7 @@
<string name="simContacts_airplaneMode" msgid="5254946758982621072">"Desactiva el modo avión para importar contactos de la tarjeta SIM."</string>
<string name="enable_pin" msgid="5422767284133234860">"Habilitar/inhabilitar PIN de tarjeta SIM"</string>
<string name="change_pin" msgid="9174186126330785343">"Cambiar PIN de tarjeta SIM"</string>
- <string name="enter_pin_text" msgid="8532615714751931951">"PIN de tarjeta SIM:"</string>
+ <string name="enter_pin_text" msgid="8532615714751931951">"PIN de la tarjeta SIM:"</string>
<string name="oldPinLabel" msgid="5287773661246368314">"PIN antiguo"</string>
<string name="newPinLabel" msgid="207488227285336897">"PIN nuevo"</string>
<string name="confirmPinLabel" msgid="257597715098070206">"Confirmar PIN nuevo"</string>
@@ -548,6 +548,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Llamada Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Vuelve a tocar para abrir"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Se ha producido un error al decodificar el mensaje."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Una tarjeta SIM ha activado tu servicio y actualizado la función de itinerancia del teléfono."</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 8843860..cd0a580 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"WiFi-kõne"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Avamiseks puudutage uuesti"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Sõnumi dekodeerimisel ilmnes viga."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM-kaart aktiveeris teenuse ja värskendas telefoni rändlusvõimeid."</string>
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 487f05c..687ccfb 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -550,5 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi deia"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Irekitzeko, ukitu berriro"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Errore bat gertatu mezua deskodetzean."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM txartel batek zerbitzua aktibatu du eta telefonoaren ibiltaritza-gaitasunak aldatu ditu."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM txartel batek zerbitzua aktibatu du eta telefonoaren ibiltaritza-gaitasunak aldatu ditu."</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f00340d..be44bb3 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>
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"تماس Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"لمس دوباره برای باز کردن"</string>
<string name="message_decode_error" msgid="3456481534066924855">"هنگام رمزگشایی پیام، خطایی روی داد."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"یک سیمکارت سرویس شما را فعال کرده است و قابلیتهای رومینگ تلفنتان را بهروز کرده است."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"یک سیمکارت سرویس شما را فعال کرده است و قابلیتهای رومینگ تلفنتان را بهروز کرده است."</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 20a9306..34b3861 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -88,7 +88,7 @@
<string name="sum_loading_settings" msgid="1826692909391168620">"Ladataan asetuksia..."</string>
<string name="sum_hide_caller_id" msgid="1071407020290873782">"Numeroa ei näytetä soitetuissa puheluissa"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"Numero näytetään soitetuissa puheluissa"</string>
- <string name="sum_default_caller_id" msgid="1954518825510901365">"Käytä numeroni näyttämistä soitettavissa puheluissa koskevia operaattorin oletusasetuksia"</string>
+ <string name="sum_default_caller_id" msgid="1954518825510901365">"Puheluja soitettaessa käytä operaattorin oletusasetuksia numeroni näyttämiseen"</string>
<string name="labelCW" msgid="6120513814915920200">"Koputus"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"Ilmoita puhelun aikana saapuvista puheluista"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"Ilmoita puhelun aikana saapuvista puheluista"</string>
@@ -103,17 +103,17 @@
<string name="sum_cfu_disabled" msgid="8384177689501334080">"Ei käytössä"</string>
<string name="labelCFB" msgid="6139853033106283172">"Kun olen varattu"</string>
<string name="messageCFB" msgid="3711089705936187129">"Soita, kun numero on varattu:"</string>
- <string name="sum_cfb_enabled" msgid="5984198104833116690">"Siirretään puhelu numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+ <string name="sum_cfb_enabled" msgid="5984198104833116690">"Puhelu siirretään numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Ei käytössä"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operaattorisi ei tue soitonsiirtojen poistamista käytöstä, kun puhelimesi on varattuna."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"Kun en vastaa"</string>
<string name="messageCFNRy" msgid="672317899884380374">"Soita, kun numero ei vastaa:"</string>
- <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Siirretään puhelu numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+ <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Puhelu siirretään numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Ei käytössä"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operaattorisi ei tue soitonsiirtojen poistamista käytöstä, kun puhelimesi ei vastaa."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Kun en ole tavoitettavissa"</string>
<string name="messageCFNRc" msgid="6380695421020295119">"Soita, kun numeroon ei saada yhteyttä:"</string>
- <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Siirretään puhelu numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+ <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Puhelu siirretään numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Pois käytöstä"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operaattorisi ei tue soitonsiirtojen poistamista käytöstä puhelimesi ollessa saavuttamattomissa."</string>
<string name="updating_title" msgid="6146755386174019046">"Puheluasetukset"</string>
@@ -158,9 +158,9 @@
<string name="select_automatically" msgid="5628402124471810174">"Valitse automaattisesti"</string>
<string name="sum_select_automatically" msgid="5614890115123292400">"Valitse ensisijainen verkko automaattisesti"</string>
<string name="register_automatically" msgid="6017849844573519637">"Automaattinen rekisteröinti..."</string>
- <string name="preferred_network_mode_title" msgid="2336624679902659306">"Ensisijainen verkon tyyppi"</string>
+ <string name="preferred_network_mode_title" msgid="2336624679902659306">"Ensisijainen verkko"</string>
<string name="preferred_network_mode_summary" msgid="1434820673166126609">"Vaihda verkon käyttötilaa"</string>
- <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ensisijainen verkon tyyppi"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Ensisijainen verkko"</string>
<string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Ensisijainen verkkotila: ensisijaisesti WCDMA"</string>
<string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Ensisijainen verkkotila: vain GSM"</string>
<string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Ensisijainen verkkotila: vain WCDMA"</string>
@@ -374,7 +374,7 @@
<string name="fdn_failed" msgid="540018079008319747">"FDN-toiminto epäonnistui."</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"Luetaan SIM-korttia…"</string>
<string name="simContacts_empty" msgid="5270660846489561932">"SIM-kortilla ei ole yhteystietoja."</string>
- <string name="simContacts_title" msgid="1861472842524839921">"Valitse tuotavat yhteystiedot"</string>
+ <string name="simContacts_title" msgid="1861472842524839921">"Valitse yhteystiedot"</string>
<string name="simContacts_airplaneMode" msgid="5254946758982621072">"Poista lentokonetila käytöstä, jos haluat tuoda yhteystietoja SIM-kortilta."</string>
<string name="enable_pin" msgid="5422767284133234860">"Ota SIM-kortin PIN-koodi käyttöön / poista koodi käytöstä"</string>
<string name="change_pin" msgid="9174186126330785343">"Vaihda SIM-kortin PIN-koodi"</string>
@@ -548,6 +548,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-puhelu"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Avaa koskettamalla uudelleen."</string>
<string name="message_decode_error" msgid="3456481534066924855">"Virhe purettaessa viestiä."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM-kortti on aktivoinut palvelusi ja päivittänyt puhelimesi roaming-toiminnot."</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 22a2fed..0c0dd0b 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -548,5 +548,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Appel Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Touchez à nouveau pour ouvrir"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Une erreur s\'est produite lors du décodage du message."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Une carte SIM a activé votre service et mis à jour les fonctionnalités d\'itinérance de votre téléphone."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Une carte SIM a activé votre service et mis à jour les fonctionnalités d\'itinérance de votre téléphone."</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f6f143c..9c6cd14 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 du réseau mobile"</string>
+ <string name="mobile_networks" msgid="2843854043339307375">"Paramètres 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éros aut. (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"Num. autorisés (<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>
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Appel Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Appuyer à nouveau pour ouvrir"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Une erreur s\'est produite lors du décodage du message."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Votre service a été activé et les fonctionnalités d\'itinérance de votre téléphone ont été mises à jour via une carte SIM."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Votre service a été activé et les fonctionnalités d\'itinérance de votre téléphone ont été mises à jour via une carte SIM."</string>
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 3f4d603..b10054a 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chamada wifi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Toca outra vez para abrir"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Produciuse un erro durante a descodificación da mensaxe."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"A tarxeta SIM activou o teu servizo e actualizou as funcións de itinerancia do teléfono."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"A tarxeta SIM activou o teu servizo e actualizou as funcións de itinerancia do teléfono."</string>
</resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index eeb5c54..ec588e1 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi કૉલ"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"ખોલવા માટે ફરી ટચ કરો"</string>
<string name="message_decode_error" msgid="3456481534066924855">"સંદેશ ડીકોડિંગ કરતી વખતે ભૂલ આવી હતી."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"એક SIM કાર્ડ એ તમારી સેવા સક્રિય કરી છે અને તમારા ફોનની રોમિંગ ક્ષમતાઓને અપડેટ કરી છે."</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 49a550e..cdf0af4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"वाई-फ़ाई कॉल"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"खोलने के लिए पुन: स्पर्श करें"</string>
<string name="message_decode_error" msgid="3456481534066924855">"संदेश डीकोड करते समय कोई त्रुटि हुई थी."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"सिम कार्ड द्वारा आपकी सेवा को सक्रिय किया गया है और आपके फ़ोन की रोमिंग क्षमताओं को अपडेट किया गया है."</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index b7c2e60..9fb5acf 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">"Postavke čitanja..."</string>
+ <string name="reading_settings" msgid="1920291699287055284">"Čitanje postavki..."</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 su onemogućeni"</string>
+ <string name="fdn_disabled" msgid="4700049736675368279">"Brojevi za fiksno biranje onemogućeni su"</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>
@@ -547,5 +547,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi poziv"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Dodirnite ponovo da biste otvorili"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Došlo je do pogreške prilikom dekodiranja poruke."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM kartica aktivirala je vašu uslugu i ažurirala mogućnosti telefona za roaming."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM kartica aktivirala je vašu uslugu i ažurirala mogućnosti telefona za roaming."</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 73f7758..40931c2 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">"Átugrás"</string>
+ <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Kihagyá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>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-hívás"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Érintse meg ismét a megnyitáshoz"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Hiba történt az üzenet dekódolása közben."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Egy SIM kártya aktiválta a szolgáltatást, valamint frissítette a telefon barangolási képességeit."</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index b742cd6..22bb01b 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -550,6 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Զանգ Wi-Fi-ի միջոցով"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Կրկին հպեք՝ բացելու համար"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Հաղորդագրությունն ապակոդավորելիս սխալ առաջացավ:"</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM քարտն ակտիվացրել է ծառայությունը և թարմացրել ձեր հեռախոսի ռոումինգի հնարավորությունները:"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c57273c..afba578 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -111,7 +111,7 @@
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Meneruskan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Nonaktif"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel tidak menjawab panggilan."</string>
- <string name="labelCFNRc" msgid="2614827454402079766">"Saat tidak dapat dijangkau"</string>
+ <string name="labelCFNRc" msgid="2614827454402079766">"Saat tidak dapat dihubungi"</string>
<string name="messageCFNRc" msgid="6380695421020295119">"Nomor jika tidak dapat dihubungi"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Meneruskan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Dinonaktifkan"</string>
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Panggilan Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Sentuh lagi untuk membuka"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Terjadi kesalahan saat mendekode pesan."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Kartu SIM telah mengaktifkan layanan dan memperbarui kemampuan roaming ponsel."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Kartu SIM telah mengaktifkan layanan dan memperbarui kemampuan roaming ponsel."</string>
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 75c8ac1..4bf3d15 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi símtal"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Snertu aftur til að opna"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Villa kom upp við að afkóða skeytið."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM-kort hefur virkjað þjónustuna þína og uppfært reikigetu símans."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM-kort hefur virkjað þjónustuna þína og uppfært reikigetu símans."</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 8546dea..8a8370e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -59,7 +59,7 @@
<string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Impostazioni di chiamata CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="apn_settings" msgid="9043423184895642077">"Nomi punti di accesso"</string>
<string name="settings_label" msgid="3876743539816984008">"Impostazioni di rete"</string>
- <string name="phone_accounts" msgid="6376603393888116364">"Account chiamata"</string>
+ <string name="phone_accounts" msgid="6376603393888116364">"Account di chiamata"</string>
<string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Effettua chiamate con"</string>
<string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Effettua chiamate SIP con"</string>
<string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Chiedi prima"</string>
@@ -68,7 +68,7 @@
<string name="phone_accounts_selection_header" msgid="1365215726106915865">"Account telefono"</string>
<string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Aggiungi account SIP"</string>
<string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurazione delle impostazioni dell\'account"</string>
- <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Tutti gli account chiamate"</string>
+ <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Tutti gli account di chiamata"</string>
<string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Seleziona gli account autorizzati a effettuare chiamate"</string>
<string name="wifi_calling" msgid="739018212480165598">"Chiamate Wi-Fi"</string>
<string name="connection_service_default_label" msgid="1498481943805913754">"Servizio di connessione integrato"</string>
@@ -548,5 +548,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chiamata Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tocca di nuovo per aprire"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Si è verificato un errore durante la decodifica del messaggio."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Una scheda SIM ha attivato il tuo servizio e ha aggiornato le funzionalità di roaming del telefono."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Una scheda SIM ha attivato il tuo servizio e ha aggiornato le funzionalità di roaming del telefono."</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1285793..075680c 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -370,7 +370,7 @@
<string name="fdn_failed" msgid="540018079008319747">"פעולת FDN נכשלה."</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"קורא מכרטיס SIM…"</string>
<string name="simContacts_empty" msgid="5270660846489561932">"אין אנשי קשר בכרטיס ה-SIM."</string>
- <string name="simContacts_title" msgid="1861472842524839921">"בחר אנשי קשר ליבוא"</string>
+ <string name="simContacts_title" msgid="1861472842524839921">"בחר אנשי קשר לייבוא"</string>
<string name="simContacts_airplaneMode" msgid="5254946758982621072">"בטל את מצב טיסה כדי לייבא אנשי קשר מכרטיס ה-SIM."</string>
<string name="enable_pin" msgid="5422767284133234860">"הפוך לפעיל/השבת PIN של SIM"</string>
<string name="change_pin" msgid="9174186126330785343">"שנה PIN של SIM"</string>
@@ -550,5 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"שיחת Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"גע שוב כדי לפתוח"</string>
<string name="message_decode_error" msgid="3456481534066924855">"אירעה שגיאה בעת פענוח ההודעה."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"כרטיס SIM הפעיל את השירות שלך ועדכן את יכולות הנדידה של הטלפון."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"כרטיס SIM הפעיל את השירות שלך ועדכן את יכולות הנדידה של הטלפון."</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f5042ec..9a74a14 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -139,7 +139,7 @@
<string name="vm_changed" msgid="380744030726254139">"ボイスメールの番号が変更されました。"</string>
<string name="vm_change_failed" msgid="3352934863246208918">"ボイスメール番号を変更できませんでした。\nこの問題が続くようであれば携帯通信会社にお問い合わせください。"</string>
<string name="fw_change_failed" msgid="5298103228470214665">"転送番号を変更できませんでした。\nこの問題が続くようであれば携帯通信会社にお問い合わせください。"</string>
- <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"現在の転送先番号設定の取得と保存ができませんでした。\n別の携帯通信会社に切り替えますか？"</string>
+ <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>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi通話"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"開くにはもう一度タップしてください"</string>
<string name="message_decode_error" msgid="3456481534066924855">"メッセージのデコード中にエラーが発生しました。"</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIMカードでサービスが有効になり、スマートフォンのローミング機能が更新されています。"</string>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index db5863e..ac697a2 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi ზარი"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"შეეხეთ ისევ გასახსნელად"</string>
<string name="message_decode_error" msgid="3456481534066924855">"შეტყობინების გაშიფრვისას წარმოიშვა შეცდომა."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM ბარათმა გაააქტიურა თქვენი სერვისი და თქვენი ტელეფონის როუმინგის შესაძლებლობები განაახლა."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM ბარათმა გაააქტიურა თქვენი სერვისი და თქვენი ტელეფონის როუმინგის შესაძლებლობები განაახლა."</string>
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index b10aadb..eab1dd4 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi қоңырауы"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Ашу үшін қайтадан түртіңіз"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Хабарды кодтан шығару кезінде қате пайда болды."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM карта қызметті белсендіріп, телефонның роуминг мүмкіндіктерін жаңартты."</string>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 2d98b17..bec490a 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ហៅតាម Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"ប៉ះម្ដងទៀតដើម្បីបើក"</string>
<string name="message_decode_error" msgid="3456481534066924855">"មានកំហុសខណៈពេលឌិកូដសារ។"</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ស៊ីមកាតបានធ្វើឲ្យសេវាកម្មរបស់អ្នកសកម្ម និងបានធ្វើបច្ចុប្បន្នភាពសមត្ថភាពរ៉ូមីងសម្រាប់ទូរស័ព្ទរបស់អ្នក។"</string>
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 68be4d3..bd1be54 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>
@@ -130,7 +130,7 @@
<string name="close_dialog" msgid="2365884406356986917">"ಸರಿ"</string>
<string name="enable" msgid="7248657275000173526">"ಆನ್ ಮಾಡು"</string>
<string name="disable" msgid="4678348128118573672">"ಆಫ್ ಮಾಡು"</string>
- <string name="change_num" msgid="239476305819844391">"ನವೀಕರಿಸು"</string>
+ <string name="change_num" msgid="239476305819844391">"ಅಪ್ಡೇಟ್ ಮಾಡು"</string>
<string-array name="clir_display_values">
<item msgid="5560134294467334594">"ನೆಟ್ವರ್ಕ್ ಡೀಫಾಲ್ಟ್"</item>
<item msgid="7876195870037833661">"ಸಂಖ್ಯೆಯನ್ನು ಮರೆಮಾಡು"</item>
@@ -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>
@@ -269,9 +269,9 @@
<string name="enable_disable_local_weather" msgid="986967454867219114">"ಸ್ಥಳೀಯ ಹವಾಮಾನ"</string>
<string name="local_weather_enable" msgid="6199315114382448922">"ಸ್ಥಳೀಯ ಹವಾಮಾನ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="local_weather_disable" msgid="2510158089142626480">"ಸ್ಥಳೀಯ ಹವಾಮಾನ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
- <string name="enable_disable_atr" msgid="8339572391278872343">"ಪ್ರದೇಶ ದಟ್ಟಣೆ ವರದಿಗಳು"</string>
- <string name="atr_enable" msgid="5541757457789181799">"ಪ್ರದೇಶ ದಟ್ಟಣೆ ವರದಿಗಳು ಸಕ್ರಿಯಗೊಂಡಿವೆ"</string>
- <string name="atr_disable" msgid="7085558154727596455">"ಪ್ರದೇಶ ದಟ್ಟಣೆ ವರದಿಗಳು ನಿಷ್ಕ್ರಿಯಗೊಂಡಿವೆ"</string>
+ <string name="enable_disable_atr" msgid="8339572391278872343">"ಪ್ರದೇಶ ಟ್ರಾಫಿಕ್ ವರದಿಗಳು"</string>
+ <string name="atr_enable" msgid="5541757457789181799">"ಪ್ರದೇಶ ಟ್ರಾಫಿಕ್ ವರದಿಗಳು ಸಕ್ರಿಯಗೊಂಡಿವೆ"</string>
+ <string name="atr_disable" msgid="7085558154727596455">"ಪ್ರದೇಶ ಟ್ರಾಫಿಕ್ ವರದಿಗಳು ನಿಷ್ಕ್ರಿಯಗೊಂಡಿವೆ"</string>
<string name="enable_disable_lafs" msgid="668189073721277199">"ಸ್ಥಳೀಯ ವಿಮಾನ ನಿಲ್ದಾಣ ಹಾರಾಟದ ವೇಳಾಪಟ್ಟಿ"</string>
<string name="lafs_enable" msgid="2791978667205137052">"ಸ್ಥಳೀಯ ವಿಮಾನ ನಿಲ್ದಾಣದ ಹಾರಾಟ ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
<string name="lafs_disable" msgid="2391212397725495350">"ಸ್ಥಳೀಯ ವಿಮಾನ ನಿಲ್ದಾಣದ ಹಾರಾಟ ವೇಳಾಪಟ್ಟಿಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</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>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ವೈ-ಫೈ ಕರೆ"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"ತೆರೆಯಲು ಮತ್ತೊಮ್ಮೆ ಸ್ಪರ್ಶಿಸಿ"</string>
<string name="message_decode_error" msgid="3456481534066924855">"ಸಂದೇಶವನ್ನು ಡೀಕೋಡ್ ಮಾಡುವಾಗ ದೋಷವುಂಟಾಗಿದೆ."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ನಿಮ್ಮ ಸೇವೆಯನ್ನು ಸಿಮ್ ಕಾರ್ಡ್ ಸಕ್ರಿಯಗೊಳಿಸಿದೆ ಮತ್ತು ನಿಮ್ಮ ಫೋನ್ನ ರೋಮಿಂಗ್ ಸಾಮರ್ಥ್ಯವನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಲಾಗಿದೆ."</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 05891b9..5101e4c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi 통화"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"다시 터치하여 열기"</string>
<string name="message_decode_error" msgid="3456481534066924855">"메시지를 디코딩하는 중에 오류가 발생했습니다."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM 카드로 서비스가 활성화되었으며 휴대전화 로밍 기능이 업데이트되었습니다."</string>
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 2645580..6f948f0 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -819,5 +819,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi чалуу"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Ачуу үчүн кайра тийиңиз"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Билдирүү дешифрленип жатканда ката кеткен."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM-карта кызматыңызды жандандырып, телефонуңуздун роуминг мүмкүнчүлүктөрүн жаңыртты."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM-карта кызматыңызды жандырып, телефонуңуздун роуминг мүмкүнчүлүктөрүн жаңыртты."</string>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 520d563..a10d96e 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ການໂທ Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"ແຕະອີກເທື່ອນຶ່ງເພື່ອເປີດ"</string>
<string name="message_decode_error" msgid="3456481534066924855">"ມີຂໍ້ຜິດພາດໃນລະຫວ່າງຖອດລະຫັດຂໍ້ຄວາມດັ່ງກ່າວ."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ແຜ່ນ SIM ໄດ້ເປີດໃຊ້ງານການບໍລິການຂອງທ່ານ ແລະອັບເດດຄວາມສາມາດໃຊ້ງານຂ້າມເຂດຂອງໂທລະສັບຂອງທ່ານແລ້ວ."</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 19dddb7..8a6c2f7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -20,7 +20,7 @@
<string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefonas"</string>
<string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Pagalbos numerio rinkiklis"</string>
<string name="phoneIconLabel" msgid="2331230813161304895">"Telefonas"</string>
- <string name="fdnListLabel" msgid="8630418672279521003">"FDN sąrašas"</string>
+ <string name="fdnListLabel" msgid="8630418672279521003">"FRN sąrašas"</string>
<string name="unknown" msgid="6878797917991465859">"Nežinomas"</string>
<string name="private_num" msgid="6713286113000232309">"Privatus numeris"</string>
<string name="payphone" msgid="4793877574636445118">"Taksofonas"</string>
@@ -107,7 +107,7 @@
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Išjungta"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatorius nepalaiko skambučių peradresavimo išjungimo, kai telefonas užimtas."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"Kai neatsako"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"Numeris kai neatsiliepiama"</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"Numeris, kai neatsiliepiama"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Peradresuojama į <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Išjungta"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatorius nepalaiko skambučių peradresavimo išjungimo, kai neatsiliepiama."</string>
@@ -328,18 +328,18 @@
<string name="carrier_settings_title" msgid="9028166176523012300">"Operatoriaus nustatymai"</string>
<string name="fdn" msgid="7878832555095183202">"Fiksuoto rinkimo numeriai"</string>
<string name="fdn_with_label" msgid="187084204115493366">"Fiksuotojo rinkimo numeriai (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="manage_fdn_list" msgid="8777755791892122369">"FDN sąrašas"</string>
- <string name="fdn_list_with_label" msgid="7437232552210469217">"Fiksuotojo rinkimo numerių sąrašas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="manage_fdn_list" msgid="8777755791892122369">"FRN sąrašas"</string>
+ <string name="fdn_list_with_label" msgid="7437232552210469217">"FRN sąrašas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"FDN aktyvinimas"</string>
<string name="fdn_enabled" msgid="5238109009915521240">"Įgalinti fiksuoto rinkimo numeriai"</string>
<string name="fdn_disabled" msgid="4700049736675368279">"Fiksuoto rinkimo numeriai išjungti"</string>
- <string name="enable_fdn" msgid="3740191529180493851">"Įgalinti FDN"</string>
+ <string name="enable_fdn" msgid="3740191529180493851">"Įgalinti FRN"</string>
<string name="disable_fdn" msgid="7944020890722540616">"Išjungti FDN"</string>
<string name="change_pin2" msgid="2153563695382176676">"Pakeisti PIN2"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"Išjungti FDN"</string>
- <string name="disable_fdn_ok" msgid="5727046928930740173">"Įgalinti FDN"</string>
+ <string name="disable_fdn_ok" msgid="5727046928930740173">"Įgalinti FRN"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Valdyti fiksuoto rinkimo numerius"</string>
- <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Pakeisti PIN kodą FDN prieigai"</string>
+ <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Pakeisti PIN kodą FRN prieigai"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Valdyti telefono numerių sąrašą"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Balso privatumas"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Įgalinti patobulintą privatumo režimą"</string>
@@ -550,6 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"„Wi-Fi“ skambutis"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Palieskite dar kartą, kad atidarytumėte"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Iškoduojant pranešimą įvyko klaida."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM kortelė suaktyvino paslaugą ir atnaujino telefono tarptinklinio duomenų ryšio funkcijas."</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 8e8ea14..0652f1c 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -20,7 +20,7 @@
<string name="phoneAppLabel" product="default" msgid="906161039445636857">"Tālrunis"</string>
<string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Ārkārtas numuru sastādītājs"</string>
<string name="phoneIconLabel" msgid="2331230813161304895">"Tālrunis"</string>
- <string name="fdnListLabel" msgid="8630418672279521003">"FNSN saraksts"</string>
+ <string name="fdnListLabel" msgid="8630418672279521003">"IZSN saraksts"</string>
<string name="unknown" msgid="6878797917991465859">"Nezināms"</string>
<string name="private_num" msgid="6713286113000232309">"Privāts numurs"</string>
<string name="payphone" msgid="4793877574636445118">"Maksas tālrunis"</string>
@@ -330,18 +330,18 @@
<string name="carrier_settings_title" msgid="9028166176523012300">"Operatora iestatījumi"</string>
<string name="fdn" msgid="7878832555095183202">"Fiksētie numuru sastādīšanas numuri"</string>
<string name="fdn_with_label" msgid="187084204115493366">"Fiksētie numuri (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="manage_fdn_list" msgid="8777755791892122369">"FNSN saraksts"</string>
- <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN saraksts (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="fdn_activation" msgid="2156479741307463576">"FNSN aktivizācija"</string>
+ <string name="manage_fdn_list" msgid="8777755791892122369">"IZSN saraksts"</string>
+ <string name="fdn_list_with_label" msgid="7437232552210469217">"IZSN saraksts (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_activation" msgid="2156479741307463576">"IZSN aktivizācija"</string>
<string name="fdn_enabled" msgid="5238109009915521240">"Fiksētie numuru sastādīšanas numuri ir iespējoti."</string>
<string name="fdn_disabled" msgid="4700049736675368279">"Fiksētie numuru sastādīšanas numuri ir atspējoti."</string>
- <string name="enable_fdn" msgid="3740191529180493851">"Iespējot FNSN"</string>
- <string name="disable_fdn" msgid="7944020890722540616">"Atspējot FNSN"</string>
+ <string name="enable_fdn" msgid="3740191529180493851">"Iespējot IZSN"</string>
+ <string name="disable_fdn" msgid="7944020890722540616">"Atspējot IZSN"</string>
<string name="change_pin2" msgid="2153563695382176676">"Mainīt PIN2"</string>
- <string name="enable_fdn_ok" msgid="7215588870329688132">"Atspējot FNSN"</string>
- <string name="disable_fdn_ok" msgid="5727046928930740173">"Iespējot FNSN"</string>
+ <string name="enable_fdn_ok" msgid="7215588870329688132">"Atspējot IZSN"</string>
+ <string name="disable_fdn_ok" msgid="5727046928930740173">"Iespējot IZSN"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Pārvaldiet fiksētos numuru sastādīšanas numurus"</string>
- <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Mainīt PIN kodu FNSN piekļuvei"</string>
+ <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Mainīt PIN kodu IZSN piekļuvei"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Pārvaldīt tālruņa numuru sarakstu"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Balss konfidencialitāte"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Iespējot uzlabotās konfidencialitātes režīmu"</string>
@@ -366,10 +366,10 @@
<string name="delete_fdn_contact" msgid="6668958073074151717">"Fiksētā numura sastādīšanas numura dzēšana"</string>
<string name="deleting_fdn_contact" msgid="5669163206349319969">"Notiek fiksētā numuru sastādīšanas numura dzēšana…"</string>
<string name="fdn_contact_deleted" msgid="7154162327112259569">"Fiksētais numuru sastādīšanas numurs ir atspējots."</string>
- <string name="pin2_invalid" msgid="5470854099230755944">"FDN nav atjaunināts, jo tika ievadīts nepareizs PIN."</string>
- <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN netika atjaunināts, jo numurā nedrīkst būt vairāk par 20 cipariem."</string>
- <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN netika atjaunināts. Ievadītais PIN2 nebija pareizs, vai tālruņa numurs tika noraidīts."</string>
- <string name="fdn_failed" msgid="540018079008319747">"FNSN ievadīšana neizdevās."</string>
+ <string name="pin2_invalid" msgid="5470854099230755944">"IZSN nav atjaunināts, jo tika ievadīts nepareizs PIN."</string>
+ <string name="fdn_invalid_number" msgid="1494755047900009147">"IZSN netika atjaunināts, jo numurā nedrīkst būt vairāk par 20 cipariem."</string>
+ <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"IZSN netika atjaunināts. Ievadītais PIN2 nebija pareizs, vai tālruņa numurs tika noraidīts."</string>
+ <string name="fdn_failed" msgid="540018079008319747">"IZSN ievadīšana neizdevās."</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"Notiek lasīšana no SIM kartes..."</string>
<string name="simContacts_empty" msgid="5270660846489561932">"SIM kartē nav nevienas kontaktpersonas."</string>
<string name="simContacts_title" msgid="1861472842524839921">"Importējamo kontaktu atlase"</string>
@@ -549,6 +549,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi zvans"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Lai atvērtu, pieskarieties vēlreiz."</string>
<string name="message_decode_error" msgid="3456481534066924855">"Atšifrējot ziņojumu, radās kļūda."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM kartē ir aktivizēts jūsu pakalpojums un atjauninātas tālruņa viesabonēšanas iespējas."</string>
</resources>
diff --git a/res/values-mcc001-mnc01/config.xml b/res/values-mcc001-mnc01/config.xml
deleted file mode 100644
index 3e6a69b..0000000
--- a/res/values-mcc001-mnc01/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Show APN Settings for some CDMA carriers -->
- <bool name="config_show_apn_setting_cdma">true</bool>
-</resources>
diff --git a/res/values-mcc001-mnc010/config.xml b/res/values-mcc001-mnc010/config.xml
deleted file mode 100644
index 3e6a69b..0000000
--- a/res/values-mcc001-mnc010/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Show APN Settings for some CDMA carriers -->
- <bool name="config_show_apn_setting_cdma">true</bool>
-</resources>
diff --git a/res/values-mcc234-mnc02/config.xml b/res/values-mcc234-mnc02/config.xml
deleted file mode 100644
index 7eccfdc..0000000
--- a/res/values-mcc234-mnc02/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Telephony service resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Configure certain GsmUmtsOptions to be available or not. The
- default values are in services/Telephony/res/values/config.xml
- and maybe overridden in operator specific resource directories
- or device specific overlays. -->
- <bool name="config_prefer_2g" translatable="false">false</bool>
-</resources>
diff --git a/res/values-mcc234-mnc10/config.xml b/res/values-mcc234-mnc10/config.xml
deleted file mode 100644
index 7eccfdc..0000000
--- a/res/values-mcc234-mnc10/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Telephony service resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Configure certain GsmUmtsOptions to be available or not. The
- default values are in services/Telephony/res/values/config.xml
- and maybe overridden in operator specific resource directories
- or device specific overlays. -->
- <bool name="config_prefer_2g" translatable="false">false</bool>
-</resources>
diff --git a/res/values-mcc234-mnc11/config.xml b/res/values-mcc234-mnc11/config.xml
deleted file mode 100644
index 7eccfdc..0000000
--- a/res/values-mcc234-mnc11/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Telephony service resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Configure certain GsmUmtsOptions to be available or not. The
- default values are in services/Telephony/res/values/config.xml
- and maybe overridden in operator specific resource directories
- or device specific overlays. -->
- <bool name="config_prefer_2g" translatable="false">false</bool>
-</resources>
diff --git a/res/values-mcc246-mnc081/config.xml b/res/values-mcc246-mnc081/config.xml
deleted file mode 100644
index 3e6a69b..0000000
--- a/res/values-mcc246-mnc081/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Show APN Settings for some CDMA carriers -->
- <bool name="config_show_apn_setting_cdma">true</bool>
-</resources>
diff --git a/res/values-mcc310-mnc004/config.xml b/res/values-mcc310-mnc004/config.xml
deleted file mode 100755
index 198e65f..0000000
--- a/res/values-mcc310-mnc004/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Flag indicating if dtmf tone type is enabled -->
- <bool name="support_swap_after_merge" translatable="false">false</bool>
- <!-- Determine whether the voicemail notification is persistent in the notification bar.
- If true, the voicemail notifications cannot be dismissed from the notification bar. -->
- <bool name="voicemail_notification_persistent">true</bool>
-</resources>
diff --git a/res/values-mcc310-mnc028/config.xml b/res/values-mcc310-mnc028/config.xml
deleted file mode 100644
index 3e6a69b..0000000
--- a/res/values-mcc310-mnc028/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Show APN Settings for some CDMA carriers -->
- <bool name="config_show_apn_setting_cdma">true</bool>
-</resources>
diff --git a/res/values-mcc310-mnc120/config.xml b/res/values-mcc310-mnc120/config.xml
deleted file mode 100644
index 93a8079..0000000
--- a/res/values-mcc310-mnc120/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Flag indicating if dtmf tone type is enabled -->
- <bool name="dtmf_type_enabled">true</bool>
- <!-- Determine whether the voicemail notification is persistent in the notification bar.
- If true, the voicemail notifications cannot be dismissed from the notification bar. -->
- <bool name="voicemail_notification_persistent">true</bool>
-</resources>
diff --git a/res/values-mcc310-mnc410/config.xml b/res/values-mcc310-mnc410/config.xml
deleted file mode 100644
index bf89c34..0000000
--- a/res/values-mcc310-mnc410/config.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2015 The Android Open Source Project
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License
- -->
-
-<resources>
- <bool name="support_pause_ims_video_calls" translatable="false">false</bool>
-</resources>
\ No newline at end of file
diff --git a/res/values-mcc311-mnc220/config.xml b/res/values-mcc311-mnc220/config.xml
deleted file mode 100644
index 22701f0..0000000
--- a/res/values-mcc311-mnc220/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Flag indicating if dtmf tone type is enabled -->
- <bool name="dtmf_type_enabled">true</bool>
- <!-- CDMA activation goes through OTASP. -->
- <bool name="config_use_otasp_for_provisioning">true</bool>
-</resources>
diff --git a/res/values-mcc311-mnc390/config.xml b/res/values-mcc311-mnc390/config.xml
deleted file mode 100644
index 4656904..0000000
--- a/res/values-mcc311-mnc390/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Show APN Settings for some CDMA carriers -->
- <bool name="config_show_apn_setting_cdma">true</bool>
- <!-- Flag indicating if dtmf tone type is enabled -->
- <bool name="dtmf_type_enabled">true</bool>
-</resources>
diff --git a/res/values-mcc311-mnc480/config.xml b/res/values-mcc311-mnc480/config.xml
deleted file mode 100755
index b7d0d6e..0000000
--- a/res/values-mcc311-mnc480/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Flag indicating if dtmf tone type is enabled -->
- <bool name="dtmf_type_enabled">true</bool>
- <bool name="support_swap_after_merge" translatable="false">false</bool>
- <!-- Determine whether the voicemail notification is persistent in the notification bar.
- If true, the voicemail notifications cannot be dismissed from the notification bar. -->
- <bool name="voicemail_notification_persistent">true</bool>
- <bool name="support_pause_ims_video_calls" translatable="false">true</bool>
-</resources>
diff --git a/res/values-mcc311-mnc490/config.xml b/res/values-mcc311-mnc490/config.xml
deleted file mode 100644
index 93a8079..0000000
--- a/res/values-mcc311-mnc490/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Flag indicating if dtmf tone type is enabled -->
- <bool name="dtmf_type_enabled">true</bool>
- <!-- Determine whether the voicemail notification is persistent in the notification bar.
- If true, the voicemail notifications cannot be dismissed from the notification bar. -->
- <bool name="voicemail_notification_persistent">true</bool>
-</resources>
diff --git a/res/values-mcc311-mnc580/config.xml b/res/values-mcc311-mnc580/config.xml
deleted file mode 100644
index 22701f0..0000000
--- a/res/values-mcc311-mnc580/config.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Phone app resources that may need to be customized
- for different hardware or product builds. -->
-<resources>
- <!-- Flag indicating if dtmf tone type is enabled -->
- <bool name="dtmf_type_enabled">true</bool>
- <!-- CDMA activation goes through OTASP. -->
- <bool name="config_use_otasp_for_provisioning">true</bool>
-</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index ea70a59..0088d89 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -550,6 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Повик преку Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Допрете повторно за да отворите"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Настана грешка при дешифрирање на пораката."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Вашата СИМ-картичка ја активираше услугата и ги ажурираше способностите за роаминг на вашиот телефон."</string>
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 93354c5..5abee72 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -59,7 +59,7 @@
<string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA കോൾ ക്രമീകരണം (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="apn_settings" msgid="9043423184895642077">"ആക്സസ്സ് പോയിന്റ് പേരുകൾ"</string>
<string name="settings_label" msgid="3876743539816984008">"നെറ്റ്വർക്ക് ക്രമീകരണങ്ങൾ"</string>
- <string name="phone_accounts" msgid="6376603393888116364">"കോളുചെയ്യാനുള്ള അക്കൗണ്ട്"</string>
+ <string name="phone_accounts" msgid="6376603393888116364">"കോളിംഗ് അക്കൗണ്ട്"</string>
<string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"ഇത് ഉപയോഗിച്ച് കോളുചെയ്യുക"</string>
<string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"ഇതുപയോഗിച്ച് SIP കോളുചെയ്യുക"</string>
<string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ആദ്യതവണ ചോദിക്കുക"</string>
@@ -68,9 +68,9 @@
<string name="phone_accounts_selection_header" msgid="1365215726106915865">"ഫോൺ അക്കൗണ്ടുകൾ"</string>
<string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP അക്കൗണ്ട് ചേർക്കുക"</string>
<string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"അക്കൗണ്ട് ക്രമീകരണങ്ങൾ കോൺഫിഗർചെയ്യുക"</string>
- <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"കോളുചെയ്യാനുള്ള എല്ലാ അക്കൗണ്ടുകളും"</string>
+ <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"എല്ലാ കോളിംഗ് അക്കൗണ്ടുകളും"</string>
<string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"ഫോൺ വിളിക്കാനാകുന്ന അക്കൗണ്ടുകൾ തിരഞ്ഞെടുക്കുക"</string>
- <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi കോളിംഗ്"</string>
+ <string name="wifi_calling" msgid="739018212480165598">"വൈഫൈ കോളിംഗ്"</string>
<string name="connection_service_default_label" msgid="1498481943805913754">"അന്തർ നിർമ്മിത കണക്ഷൻ സേവനം"</string>
<string name="voicemail" msgid="8693759337917898954">"വോയ്സ് മെയില്"</string>
<string name="voicemail_settings_with_label" msgid="152724978380748296">"ശബ്ദമെയിൽ(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -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>
@@ -92,8 +92,8 @@
<string name="labelCW" msgid="6120513814915920200">"കോൾ വെയ്റ്റിംഗ്"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"ഒരു കോളിനിടയിൽ, ഇൻകമിംഗ് കോളുകളെക്കുറിച്ച് എന്നെ അറിയിക്കുക"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"ഒരു കോളിനിടയിൽ, ഇൻകമിംഗ് കോളുകളെക്കുറിച്ച് എന്നെ അറിയിക്കുക"</string>
- <string name="call_forwarding_settings" msgid="3378927671091537173">"കോൾ കൈമാറൽ ക്രമീകരണങ്ങൾ"</string>
- <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"കോൾ ഫോർവാഡുചെയ്യൽ ക്രമീകരണങ്ങൾ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -118,7 +118,7 @@
<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>
+ <string name="call_settings_with_label" msgid="89359812614544532">"ക്രമീകരണം (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="7970259216988931777">"കോൾ ക്രമീകരണ പിശക്"</string>
<string name="reading_settings" msgid="1920291699287055284">"ക്രമീകരണങ്ങൾ റീഡുചെയ്യുന്നു.…"</string>
<string name="updating_settings" msgid="8171225533884883252">"ക്രമീകരണങ്ങൾ അപ്ഡേറ്റുചെയ്യുന്നു…"</string>
@@ -130,7 +130,7 @@
<string name="close_dialog" msgid="2365884406356986917">"ശരി"</string>
<string name="enable" msgid="7248657275000173526">"ഓണാക്കുക"</string>
<string name="disable" msgid="4678348128118573672">"ഓഫ്"</string>
- <string name="change_num" msgid="239476305819844391">"അപ്ഡേറ്റ് ചെയ്യുക"</string>
+ <string name="change_num" msgid="239476305819844391">"അപ്ഡേറ്റുചെയ്യുക"</string>
<string-array name="clir_display_values">
<item msgid="5560134294467334594">"സ്ഥിര നെറ്റ്വർക്ക്"</item>
<item msgid="7876195870037833661">"നമ്പർ മറയ്ക്കുക"</item>
@@ -327,7 +327,7 @@
<string name="cdma_lte_data_service" msgid="4255018217292548962">"ഡാറ്റ സേവനം സജ്ജീകരിക്കുക"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"കാരിയർ ക്രമീകരണങ്ങൾ"</string>
<string name="fdn" msgid="7878832555095183202">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ"</string>
- <string name="fdn_with_label" msgid="187084204115493366">"സ്ഥിരമായി ഡയൽചെയ്യുന്ന നമ്പറുകൾ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"സ്ഥിര ഡയലിംഗ് നമ്പറുകൾ (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"FDN ലിസ്റ്റ്"</string>
<string name="fdn_list_with_label" msgid="7437232552210469217">"FDN ലിസ്റ്റ് (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"FDN സജീവമാക്കൽ"</string>
@@ -480,7 +480,7 @@
<string name="ota_hfa_activation_title" msgid="2234246934160473981">"സജീവമാക്കുന്നു..."</string>
<string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"ഫോൺ നിങ്ങളുടെ മൊബൈൽ ഡാറ്റ സേവനം സജീവമാക്കുന്നു.\n\nഇതിന് 5 മിനിറ്റ് വരെയെടുക്കാം."</string>
<string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"സജീവമാക്കൽ ഒഴിവാക്കണോ?"</string>
- <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"നിങ്ങൾ സജീവമാക്കൽ ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങൾക്ക് കോളുകൾ വിളിക്കാനോ മൊബൈൽ ഡാറ്റ നെറ്റ്വർക്കുകളിൽ കണക്റ്റുചെയ്യാനോ കഴിയില്ല (എങ്കിലും നിങ്ങൾക്ക് Wi-Fi നെറ്റ്വർക്കുകളിൽ കണക്റ്റുചെയ്യാം). നിങ്ങളുടെ ഫോൺ സജീവമാക്കുന്നതുവരെ, അത് ഓൺ ചെയ്യുമ്പോഴെല്ലാം സജീവമാക്കാൻ നിങ്ങളോട് ആവശ്യപ്പെടും."</string>
+ <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"നിങ്ങൾ സജീവമാക്കൽ ഒഴിവാക്കുകയാണെങ്കിൽ, നിങ്ങൾക്ക് കോളുകൾ വിളിക്കാനോ മൊബൈൽ ഡാറ്റ നെറ്റ്വർക്കുകളിൽ കണക്റ്റുചെയ്യാനോ കഴിയില്ല (എങ്കിലും നിങ്ങൾക്ക് വൈഫൈ നെറ്റ്വർക്കുകളിൽ കണക്റ്റുചെയ്യാം). നിങ്ങളുടെ ഫോൺ സജീവമാക്കുന്നതുവരെ, അത് ഓൺ ചെയ്യുമ്പോഴെല്ലാം സജീവമാക്കാൻ നിങ്ങളോട് ആവശ്യപ്പെടും."</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>
@@ -540,9 +540,9 @@
<string name="sim_description_emergency_calls" msgid="7535215397212301562">"അടിയന്തിര കോൾചെയ്യൽ മാത്രം"</string>
<string name="sim_description_default" msgid="4778679519938775515">"SIM കാർഡ്, സ്ലോട്ട്: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
<string name="accessibility_settings_activity_title" msgid="8562004288733103868">"പ്രവേശനക്ഷമത"</string>
- <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ഇൻകമിംഗ് Wi-Fi കോൾ"</string>
- <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi കോൾ"</string>
+ <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ഇൻകമിംഗ് വൈഫൈ കോൾ"</string>
+ <string name="status_hint_label_wifi_call" msgid="8900805254974653903">"വൈഫൈ കോൾ"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"തുറക്കുന്നതിന് വീണ്ടും സ്പർശിക്കുക"</string>
<string name="message_decode_error" msgid="3456481534066924855">"സന്ദേശം ഡീകോഡുചെയ്യുമ്പോൾ ഒരു പിശകുണ്ടായി."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"ഒരു SIM കാർഡ് നിങ്ങളുടെ സേവനം സജീവമാക്കി, ഫോണിന്റെ റോമിംഗ് ശേഷികൾ അപ്ഡേറ്റ് ചെയ്തു."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ഒരു SIM കാർഡ് നിങ്ങളുടെ സേവനം സജീവമാക്കി, ഫോണിന്റെ റോമിംഗ് ശേഷികൾ അപ്ഡേറ്റ് ചെയ്തു."</string>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 78d49e1..0c695fb 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi дуудлага"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Нээхийн тулд дахин хүрнэ үү"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Зурвасын кодыг тайлах явцад алдаа гарсан."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM карт таны үйлчилгээг идэвхжүүлж, утасны роаминг багтаамжийг шинэчиллээ."</string>
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index ad7c7fd..5e10f1a 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"वाय-फाय कॉल"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"उघडण्यासाठी पुन्हा स्पर्श करा"</string>
<string name="message_decode_error" msgid="3456481534066924855">"संदेश डीकोड करताना एक त्रुटी आली."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"सिम कार्डने आपली सेवा सक्रिय केली आहे आणि आपल्या फोनच्या रोमिंग क्षमता अद्यतनित केल्या."</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 706d70e..df42459 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">"Semasa tidak dijawab"</string>
+ <string name="labelCFNRy" msgid="1736067178393744351">"Jika 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">"Semasa tidak dapat dihubungi"</string>
+ <string name="labelCFNRc" msgid="2614827454402079766">"Jika 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 apabila melakukan perayauan"</string>
- <string name="roaming_disable" msgid="1843417228755568110">"Bersambung ke perkhidmatan data semasa melakukan perayauan"</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_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>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Panggilan Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Sentuh lagi untuk membuka"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Terdapat ralat semasa menyahkodkan mesej."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Kad SIM telah mengaktifkan perkhidmatan anda dan mengemas kini keupayaan perayauan telefon anda."</string>
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index b5d2d98..f9708f3 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"ဝိုင်ဖိုင်ခေါ်ဆိုမှု"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"ဖွင့်ရန် ထပ်ပြီး ထိပါ"</string>
<string name="message_decode_error" msgid="3456481534066924855">"စာကို ကုဒ်ဖွင့်နေစဉ် အမှားရှိခဲ့သည်။"</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM ကဒ်သည် သင့် ဖုန်းဝန်ဆောင်မှုအား အသက်သွင်းခဲ့ပြီး သင့်ဖုန်း၏ ကွန်ယက်ပြင်ပဒေတာသုံးနိုင်စွမ်းအား ပြင်ဆင်မွမ်းမံပြီးဖြစ်၏။"</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM ကဒ်သည် သင့် ဖုန်းဝန်ဆောင်မှုအား အသက်သွင်းခဲ့ပြီး သင့်ဖုန်း၏ ကွန်ယက်ပြင်ပဒေတာသုံးနိုင်စွမ်းအား ပြင်ဆင်မွမ်းမံပြီးဖြစ်၏။"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 878e61d..2ae3e72 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -20,7 +20,7 @@
<string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
<string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Nødnummer"</string>
<string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
- <string name="fdnListLabel" msgid="8630418672279521003">"Faste numre"</string>
+ <string name="fdnListLabel" msgid="8630418672279521003">"Liste over faste numre"</string>
<string name="unknown" msgid="6878797917991465859">"Ukjent"</string>
<string name="private_num" msgid="6713286113000232309">"Hemmelig nummer"</string>
<string name="payphone" msgid="4793877574636445118">"Telefonkiosk"</string>
@@ -42,8 +42,8 @@
<string name="pause_prompt_yes" msgid="3564467212025151797">"Ja"</string>
<string name="pause_prompt_no" msgid="6686238803236884877">"Nei"</string>
<string name="wild_prompt_str" msgid="5543521676355533577">"Erstatt jokertegn med"</string>
- <string name="no_vm_number" msgid="4164780423805688336">"Mangler nummer til telefonsvarer"</string>
- <string name="no_vm_number_msg" msgid="1300729501030053828">"Det er ikke lagret noe telefonsvarernummer på SIM-kortet."</string>
+ <string name="no_vm_number" msgid="4164780423805688336">"Mangler nummer til talepostkasse"</string>
+ <string name="no_vm_number_msg" msgid="1300729501030053828">"Det er ikke lagret noe nummer for talepostkasse på SIM-kortet."</string>
<string name="add_vm_number_str" msgid="4676479471644687453">"Legg til nummer"</string>
<string name="puk_unlocked" msgid="2284912838477558454">"SIM-kortet er blitt avblokkert. Telefonen låses opp…"</string>
<string name="label_ndp" msgid="780479633159517250">"PIN-kode for å fjerne operatørlås"</string>
@@ -61,7 +61,7 @@
<string name="settings_label" msgid="3876743539816984008">"Nettverksinnstillinger"</string>
<string name="phone_accounts" msgid="6376603393888116364">"Ringekontoer"</string>
<string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Ring med"</string>
- <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Foreta SIP-oppringing med"</string>
+ <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Foreta SIP-anrop med"</string>
<string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Spør først"</string>
<string name="phone_accounts_settings_header" msgid="4141710640883261094">"Innstillinger"</string>
<string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Velg kontoer"</string>
@@ -72,8 +72,8 @@
<string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Velg hvilke kontoer som kan ringe"</string>
<string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-anrop"</string>
<string name="connection_service_default_label" msgid="1498481943805913754">"Innebygd tilkoblingstjeneste"</string>
- <string name="voicemail" msgid="8693759337917898954">"Telefonsvarer"</string>
- <string name="voicemail_settings_with_label" msgid="152724978380748296">"Telefonsvarer (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="voicemail" msgid="8693759337917898954">"Talepostkasse"</string>
+ <string name="voicemail_settings_with_label" msgid="152724978380748296">"Talepostkasse (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="voicemail_abbreviated" msgid="2215592488517217448">"Svarer:"</string>
<string name="networks" msgid="8873030692174541976">"Nettoperatører"</string>
<string name="cell_broadcast_settings" msgid="8740238216690502563">"Nødvarsler"</string>
@@ -88,14 +88,14 @@
<string name="sum_loading_settings" msgid="1826692909391168620">"Laster inn innstillinger …"</string>
<string name="sum_hide_caller_id" msgid="1071407020290873782">"Skjul nummer ved utgående samtaler"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"Vis nummer ved utgående samtaler"</string>
- <string name="sum_default_caller_id" msgid="1954518825510901365">"La operatøren bestemme om nummeret vises ved utgående samtaler"</string>
+ <string name="sum_default_caller_id" msgid="1954518825510901365">"Bruk standard operatørinnstillinger til å vise nummeret mitt i utgående anrop"</string>
<string name="labelCW" msgid="6120513814915920200">"Samtale venter"</string>
<string name="sum_cw_enabled" msgid="8083061901633671397">"Under samtaler, varsle om innkommende anrop"</string>
<string name="sum_cw_disabled" msgid="3648693907300104575">"Varsle om innkommende anrop under samtaler"</string>
<string name="call_forwarding_settings" msgid="3378927671091537173">"Innstillinger for viderekobling"</string>
- <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Videresending av anrop (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Innstillinger for viderekobling (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCF" msgid="2574386948026924737">"Viderekobling"</string>
- <string name="labelCFU" msgid="8147177368148660600">"Viderekoble alltid"</string>
+ <string name="labelCFU" msgid="8147177368148660600">"Alltid viderekoble"</string>
<string name="messageCFU" msgid="3560082430662923687">"Bruk alltid dette nummeret"</string>
<string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Viderekoble alle anrop"</string>
<string name="sum_cfu_enabled" msgid="2450052502198827927">"Viderekobler alle anrop til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
@@ -111,16 +111,16 @@
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Viderekobler til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Av"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatøren støtter ikke deaktivering av viderekobling når anropet ikke besvares."</string>
- <string name="labelCFNRc" msgid="2614827454402079766">"Når mottaker ikke kan nås"</string>
+ <string name="labelCFNRc" msgid="2614827454402079766">"Når mottaker ikke nås"</string>
<string name="messageCFNRc" msgid="6380695421020295119">"Nummer når mottaker ikke kan nås"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Viderekobler til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Slått av"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatøren støtter ikke deaktivering av viderekobling når telefonen er utenfor dekning."</string>
<string name="updating_title" msgid="6146755386174019046">"Samtaleinnstillinger"</string>
<string name="call_settings_primary_user_only" msgid="5679923943740900965">"Anropsinnstillinger kan bare endres av hovedbrukeren."</string>
- <string name="call_settings_with_label" msgid="89359812614544532">"Anropsvalg (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="call_settings_with_label" msgid="89359812614544532">"Samtaleinnstillinger (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="error_updating_title" msgid="7970259216988931777">"Feil ved samtaleinnstillinger"</string>
- <string name="reading_settings" msgid="1920291699287055284">"Leser innstillinger …"</string>
+ <string name="reading_settings" msgid="1920291699287055284">"Leser innstillingene …"</string>
<string name="updating_settings" msgid="8171225533884883252">"Oppdaterer innstillinger…"</string>
<string name="reverting_settings" msgid="4752151682666912828">"Tilbakestiller innstillinger ..."</string>
<string name="response_error" msgid="6674110501330139405">"Uventet svar fra nettverket."</string>
@@ -136,16 +136,16 @@
<item msgid="7876195870037833661">"Skjul nummer"</item>
<item msgid="1108394741608734023">"Vis nummer"</item>
</string-array>
- <string name="vm_changed" msgid="380744030726254139">"Telefonsvarernummeret ble endret."</string>
- <string name="vm_change_failed" msgid="3352934863246208918">"Kan ikke endre mobilsvarnummeret.\nKontakt operatøren din hvis dette problemet vedvarer."</string>
+ <string name="vm_changed" msgid="380744030726254139">"Nummeret til talepostkassen ble endret."</string>
+ <string name="vm_change_failed" msgid="3352934863246208918">"Kan ikke endre nummeret for talepostkassen.\nKontakt operatøren din hvis problemet vedvarer."</string>
<string name="fw_change_failed" msgid="5298103228470214665">"Kunne ikke endre viderekoblingsnummeret.\nKontakt operatøren hvis dette problemet vedvarer."</string>
<string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Kunne ikke hente og lagre gjeldende innstillinger for viderekoblingsnummer.\nVil du likevel bytte til den nye leverandøren?"</string>
<string name="no_change" msgid="3186040086622435212">"Ingen endringer ble utført."</string>
- <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Velg talemeldingsleverandør"</string>
+ <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Velg leverandør for talepostkasse"</string>
<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>
@@ -335,7 +335,7 @@
<string name="fdn" msgid="7878832555095183202">"Faste numre"</string>
<string name="fdn_with_label" msgid="187084204115493366">"Faste numre (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="manage_fdn_list" msgid="8777755791892122369">"Liste over faste numre"</string>
- <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN-liste (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_list_with_label" msgid="7437232552210469217">"Liste over faste numre (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="fdn_activation" msgid="2156479741307463576">"Aktivering av faste numre"</string>
<string name="fdn_enabled" msgid="5238109009915521240">"Kun faste numre kan ringes"</string>
<string name="fdn_disabled" msgid="4700049736675368279">"Faste numre er slått av"</string>
@@ -343,10 +343,10 @@
<string name="disable_fdn" msgid="7944020890722540616">"Slå av faste numre"</string>
<string name="change_pin2" msgid="2153563695382176676">"Endre PIN2"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"Slå av faste numre"</string>
- <string name="disable_fdn_ok" msgid="5727046928930740173">"Slå på faste nummre"</string>
+ <string name="disable_fdn_ok" msgid="5727046928930740173">"Slå på faste numre"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Vedlikehold liste over faste numre"</string>
<string name="sum_fdn_change_pin" msgid="6666549734792827932">"Endre PIN-kode for å styre faste numre"</string>
- <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Endre liste over telefonnumre"</string>
+ <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrer liste over telefonnumre"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Personvern for Google Voice"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Aktiver forbedret personvern"</string>
<string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-modus"</string>
@@ -374,7 +374,7 @@
<string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ble ikke oppdatert fordi tallet ikke kan overstige 20 sifre."</string>
<string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Fast nummer ble ikke oppdatert. PIN2 var feil, eller telefonnummeret ble avvist."</string>
<string name="fdn_failed" msgid="540018079008319747">"FDN-handlingen mislyktes."</string>
- <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leser fra SIM-kort…"</string>
+ <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leser fra SIM-kort …"</string>
<string name="simContacts_empty" msgid="5270660846489561932">"Ingen kontakter på SIM-kortet."</string>
<string name="simContacts_title" msgid="1861472842524839921">"Velg kontakter for import"</string>
<string name="simContacts_airplaneMode" msgid="5254946758982621072">"Slå av flymodus for å importere kontakter fra SIM-kortet."</string>
@@ -413,7 +413,7 @@
<string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-koden er ikke lenger blokkert"</string>
<string name="pin2_error_exception" msgid="1088689322248996699">"Feil på nettverket eller SIM-kortet"</string>
<string name="doneButton" msgid="2859593360997984240">"Ferdig"</string>
- <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer til telefonsvarer"</string>
+ <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer til talepostkasse"</string>
<string name="card_title_dialing" msgid="5769417478498348054">"Ringer"</string>
<string name="card_title_redialing" msgid="8253487008234167266">"Slår nummer på nytt"</string>
<string name="card_title_conf_call" msgid="1162980346189744501">"Telefonmøte"</string>
@@ -422,10 +422,10 @@
<string name="card_title_on_hold" msgid="821463117892339942">"Parkert"</string>
<string name="card_title_hanging_up" msgid="3999101620995182450">"Legger på"</string>
<string name="card_title_in_call" msgid="6346543933068225205">"Samtale pågår"</string>
- <string name="notification_voicemail_title" msgid="8933468752045550523">"Nye talemeldinger"</string>
+ <string name="notification_voicemail_title" msgid="8933468752045550523">"Ny talemelding"</string>
<string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nye talemeldinger (<xliff:g id="COUNT">%d</xliff:g>)"</string>
<string name="notification_voicemail_text_format" msgid="4447323569453981685">"Ring <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
- <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Mangler nummer til telefonsvarer"</string>
+ <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Mangler nummer til talepostkasse"</string>
<string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen tjeneste"</string>
<string name="notification_network_selection_text" msgid="2607085729661923269">"Valgt nettverk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgjengelig"</string>
<string name="incall_error_power_off" msgid="2947938060513306698">"Slå av flymodus for å ringe."</string>
@@ -534,7 +534,7 @@
<string name="description_dial_button" msgid="7459705245418435351">"ring"</string>
<string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrering"</string>
<string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrering"</string>
- <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
+ <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visuell talepostkasse"</string>
<string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Lyd"</string>
<string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibrering"</string>
<string name="pstn_connection_service_label" msgid="1743245930577325900">"Innebygde SIM-kort"</string>
@@ -550,6 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Oppringing via Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Trykk på nytt for å åpne"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Det oppsto en feil under dekoding av meldingen."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Et SIM-kort har aktivert tjenesten din og oppdatert roamingfunksjonene for telefonen din."</string>
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index c882dba..456d9c2 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi कल"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"खोल्न फेरि छुनुहोस्"</string>
<string name="message_decode_error" msgid="3456481534066924855">"सन्देश डिकोड गर्दा एउटा समस्या भयो।"</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM कार्डले तपाईँको सेवा सक्रिय गर्नुका तथा फोनको रोमिङ क्षमताहरू पनि अद्यावधिक गरी दिएको छ।"</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM कार्डले तपाईँको सेवा सक्रिय गर्नुका तथा फोनको रोमिङ क्षमताहरू पनि अद्यावधिक गरिदिएको छ।"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 72a5929..af6910f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wifi-oproep"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tik nogmaals om te openen"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Er is een fout opgetreden tijdens het decoderen van het bericht."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Een simkaart heeft uw service geactiveerd en heeft de roaming-mogelijkheden van uw telefoon geüpdatet."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Een simkaart heeft uw service geactiveerd en heeft de roaming-mogelijkheden van uw telefoon geüpdatet."</string>
</resources>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 4a3c536..72acc7a 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi ਕਾਲ"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"ਖੋਲ੍ਹਣ ਲਈ ਦੁਬਾਰਾ ਛੋਹਵੋ"</string>
<string name="message_decode_error" msgid="3456481534066924855">"ਸੁਨੇਹਾ ਡੀਕੋਡ ਕਰਦੇ ਸਮੇਂ ਇੱਕ ਅਸ਼ੁੱਧੀ ਹੋਈ ਸੀ।"</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"ਇੱਕ SIM ਕਾਰਡ ਨੇ ਤੁਹਾਡੀ ਸੇਵਾ ਸਕਿਰਿਆ ਕੀਤੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫੋਨ ਦੀਆਂ ਰੋਮਿੰਗ ਸਮਰੱਥਤਾਵਾਂ ਅਪਡੇਟ ਕੀਤੀਆਂ ਹਨ।"</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ਇੱਕ SIM ਕਾਰਡ ਨੇ ਤੁਹਾਡੀ ਸੇਵਾ ਸਕਿਰਿਆ ਕੀਤੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫੋਨ ਦੀਆਂ ਰੋਮਿੰਗ ਸਮਰੱਥਤਾਵਾਂ ਅਪਡੇਟ ਕੀਤੀਆਂ ਹਨ।"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7da2a60..ccfc7f9 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">"Użyj domyślnych ustawień operatora, aby wyświetlać mój numer 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="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">"Twój operator"</string>
+ <string name="voicemail_default" msgid="2001233554889016880">"Mó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>
@@ -550,5 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Połączenie przez Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Kliknij ponownie, by otworzyć"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Podczas dekodowania wiadomości wystąpił błąd."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Karta SIM aktywowała usługę i zaktualizowała funkcje roamingowe telefonu."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Karta SIM aktywowała usługę i zaktualizowała funkcje roamingowe telefonu."</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9a6e9c3..ae5df0c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chamada Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tocar novamente para abrir"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Ocorreu um erro durante a descodificação da mensagem."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Um cartão SIM ativou o seu serviço e atualizou as capacidades de roaming do seu telemóvel."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Um cartão SIM ativou o seu serviço e atualizou as capacidades de roaming do seu telemóvel."</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 34228bc..8f2cadf 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">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+ <string name="sum_cfb_enabled" msgid="5984198104833116690">"Encaminhar 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">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+ <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Encaminhar 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">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+ <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Encaminhar 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>
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Chamada por Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Toque novamente para abrir"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Ocorreu um erro ao decodificar a mensagem."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Um cartão SIM ativou seu serviço e atualizou os recursos de roaming do seu smartphone."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Um cartão SIM ativou seu serviço e atualizou os recursos de roaming do smartphone."</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 723768b..c16e045 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 efectua apeluri"</string>
+ <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selectați conturile care pot da 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>
@@ -547,5 +547,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Apel prin Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Atingeți din nou pentru a deschide"</string>
<string name="message_decode_error" msgid="3456481534066924855">"A apărut o eroare la decodificarea mesajului."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Un card SIM a activat serviciul și a actualizat funcțiile de roaming ale telefonului."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Un card SIM a activat serviciul și a actualizat funcțiile de roaming ale telefonului."</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4b27ee5..8e6afb0 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>
@@ -552,6 +552,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-звонок"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Нажмите ещё раз, чтобы открыть"</string>
<string name="message_decode_error" msgid="3456481534066924855">"При расшифровке сообщения произошла ошибка."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"В вашем телефоне уже настроен роуминг и активирована SIM-карта."</string>
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 8b009c2..8f5b6a2 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi ඇමතුම"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"විවෘත කිරීමට නැවත ස්පර්ශ කරන්න"</string>
<string name="message_decode_error" msgid="3456481534066924855">"පණිවිඩය විකේතනය කරන අතරතුර දෝෂයක් සිදු විය."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM කාඩ්පතක් ඔබේ සේවාව සක්රිය කර ඔබේ දුරකථනයේ රෝමිං හැකියා යාවත්කාලීන කර තිබේ."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM කාඩ්පතක් ඔබේ සේවාව සක්රිය කර ඔබේ දුරකථනයේ රෝමිං හැකියා යාවත්කාලීන කර තිබේ."</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index b219ffd..46e7370 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -69,7 +69,7 @@
<string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Pridať účet SIP"</string>
<string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurácia nastavení účtu"</string>
<string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Všetky telefónne účty"</string>
- <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Výber účtov, v ktorých bude možné telefonovať"</string>
+ <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Výber účtov, pomocou ktorých bude možné telefonovať"</string>
<string name="wifi_calling" msgid="739018212480165598">"Volanie cez Wi-Fi"</string>
<string name="connection_service_default_label" msgid="1498481943805913754">"Vstavaná služba pripojenia"</string>
<string name="voicemail" msgid="8693759337917898954">"Hlasová schránka"</string>
@@ -102,16 +102,16 @@
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Číslo nie je k dispozícii"</string>
<string name="sum_cfu_disabled" msgid="8384177689501334080">"Vypnuté"</string>
<string name="labelCFB" msgid="6139853033106283172">"Keď mám obsadené"</string>
- <string name="messageCFB" msgid="3711089705936187129">"Číslo keď mám obsadené"</string>
+ <string name="messageCFB" msgid="3711089705936187129">"Číslo, keď mám obsadené"</string>
<string name="sum_cfb_enabled" msgid="5984198104833116690">"Presmerovanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Vypnuté"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Váš operátor neumožňuje zakázanie presmerovaní, keď je telefón nedostupný."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"Keď neprijímam"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"Číslo keď neprijímam"</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"Číslo, keď neprijímam"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Presmerovanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Vypnuté"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Váš operátor neumožňuje zakázanie presmerovaní hovorov, keď telefón neodpovedá."</string>
- <string name="labelCFNRc" msgid="2614827454402079766">"Keď som nedostupný/-á"</string>
+ <string name="labelCFNRc" msgid="2614827454402079766">"Pri nedostupnosti"</string>
<string name="messageCFNRc" msgid="6380695421020295119">"Číslo pri nedostupnosti"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Presmerovanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Vypnuté"</string>
@@ -339,7 +339,7 @@
<string name="enable_fdn_ok" msgid="7215588870329688132">"Vypnúť režim povolených čísel"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"Zapnúť režim povolených čísel"</string>
<string name="sum_fdn" msgid="1959399454900272878">"Umožňuje spravovať povolené čísla"</string>
- <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Umožňuje zmeniť kód PIN na prístup k povoleným číslam"</string>
+ <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Umožňuje zmeniť kód PIN na prístup k povoleným číslam"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Správa telefónneho zoznamu"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Ochrana osobných údajov hlasovej pošty"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Povoliť režim vylepšenej ochrany osobných údajov"</string>
@@ -550,5 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Hovor cez Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Otvorte opätovným klepnutím"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Pri dekódovaní správy sa vyskytla chyba"</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM karta aktivovala vašu službu a aktualizovala možnosti roamingu vášho telefónu"</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM karta aktivovala vašu službu a aktualizovala možnosti roamingu vášho telefónu"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 018f571..a740cfe 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -112,7 +112,7 @@
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Izklopljeno"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operater ne podpira izklopa preusmeritve klicev, kadar ni odgovora."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Pri nedosegljivosti"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"Številka, ko ni dosegljivo"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Številka, ko nisem dosegljiv"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Preusmerjanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Onemogočeno"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Vaš operater ne podpira izklopa preusmeritve klicev, kadar je telefon nedosegljiv."</string>
@@ -132,9 +132,9 @@
<string name="disable" msgid="4678348128118573672">"Izklopi"</string>
<string name="change_num" msgid="239476305819844391">"Posodobi"</string>
<string-array name="clir_display_values">
- <item msgid="5560134294467334594">"Privzeto omrežje"</item>
+ <item msgid="5560134294467334594">"Omrežno privzeto"</item>
<item msgid="7876195870037833661">"Skrij številko"</item>
- <item msgid="1108394741608734023">"Prikaz številke"</item>
+ <item msgid="1108394741608734023">"Prikaži številko"</item>
</string-array>
<string name="vm_changed" msgid="380744030726254139">"Številka glasovne pošte je spremenjena."</string>
<string name="vm_change_failed" msgid="3352934863246208918">"Številke odzivnika ni mogoče spremeniti.\nČe se težava ponovi, se obrnite na operaterja."</string>
@@ -143,7 +143,7 @@
<string name="no_change" msgid="3186040086622435212">"Narejena ni bila nobena sprememba."</string>
<string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Izberite storitev glasovne pošte"</string>
<string name="voicemail_default" msgid="2001233554889016880">"Vaš operater"</string>
- <string name="mobile_networks" msgid="2843854043339307375">"Nastavitve mobilnega omrežja"</string>
+ <string name="mobile_networks" msgid="2843854043339307375">"Nastavitve mob. omrežja"</string>
<string name="label_available" msgid="1181658289009300430">"Razpoložljiva omrežja"</string>
<string name="load_networks_progress" msgid="5230707536168902952">"Iskanje ..."</string>
<string name="empty_networks_list" msgid="4249426905018815316">"Najdeno ni bilo nobeno omrežje."</string>
@@ -550,5 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Klic Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Dotaknite se znova, če želite odpreti"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Napaka pri dekodiranju sporočila."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Kartica SIM je aktivirala vašo storitev in posodobila zmožnosti telefona za gostovanje."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Kartica SIM je aktivirala vašo storitev in posodobila zmožnosti telefona za gostovanje."</string>
</resources>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 8dc38ae..a72b176 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -20,7 +20,7 @@
<string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefoni"</string>
<string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Formuesi i numrit të urgjencës"</string>
<string name="phoneIconLabel" msgid="2331230813161304895">"Telefoni"</string>
- <string name="fdnListLabel" msgid="8630418672279521003">"Lista FDN"</string>
+ <string name="fdnListLabel" msgid="8630418672279521003">"Lista e FDN-ve"</string>
<string name="unknown" msgid="6878797917991465859">"I panjohur"</string>
<string name="private_num" msgid="6713286113000232309">"Numër privat"</string>
<string name="payphone" msgid="4793877574636445118">"Telefon me pagesë"</string>
@@ -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">"Refuzo"</string>
+ <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Injoro"</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>
@@ -89,9 +89,9 @@
<string name="sum_hide_caller_id" msgid="1071407020290873782">"Numri është i fshehur në telefonatat dalëse"</string>
<string name="sum_show_caller_id" msgid="6768534125447290401">"Numri është shfaqur në telefonatat dalëse"</string>
<string name="sum_default_caller_id" msgid="1954518825510901365">"Përdor cilësimet e operatorit për të shfaqur numrin tim në telefonatat dalëse"</string>
- <string name="labelCW" msgid="6120513814915920200">"Pritje telefonate"</string>
- <string name="sum_cw_enabled" msgid="8083061901633671397">"Gjatë një telefonate, më njofto për telefonatat hyrëse"</string>
- <string name="sum_cw_disabled" msgid="3648693907300104575">"Gjatë një telefonate, më njofto për telefonatat hyrëse"</string>
+ <string name="labelCW" msgid="6120513814915920200">"Pritja e telefonatave"</string>
+ <string name="sum_cw_enabled" msgid="8083061901633671397">"Gjatë një telefonate, më sinjalizo për telefonata të reja hyrëse"</string>
+ <string name="sum_cw_disabled" msgid="3648693907300104575">"Gjatë një telefonate, më sinjalizo për telefonata të reja hyrëse"</string>
<string name="call_forwarding_settings" msgid="3378927671091537173">"Cilësimet e transferimit të telefonatës"</string>
<string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Cilësimet e transferimit të telefonatës (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCF" msgid="2574386948026924737">"Transferimi i telefonatës"</string>
@@ -102,17 +102,17 @@
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numri nuk mund të përdoret"</string>
<string name="sum_cfu_disabled" msgid="8384177689501334080">"Çaktivizuar"</string>
<string name="labelCFB" msgid="6139853033106283172">"Kur është e zënë"</string>
- <string name="messageCFB" msgid="3711089705936187129">"Numri, nëse është i zënë"</string>
+ <string name="messageCFB" msgid="3711089705936187129">"Numri, nëse linja është e zënë"</string>
<string name="sum_cfb_enabled" msgid="5984198104833116690">"Transferim te <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Çaktivizuar"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatori yt nuk mbështet çaktivizimin e transferimit të telefonatës kur telefoni është i zënë."</string>
<string name="labelCFNRy" msgid="1736067178393744351">"Kur nuk përgjigjet"</string>
- <string name="messageCFNRy" msgid="672317899884380374">"Numri, nëse s\'ka përgjigje"</string>
+ <string name="messageCFNRy" msgid="672317899884380374">"Numri, nëse nuk përgjigjet"</string>
<string name="sum_cfnry_enabled" msgid="6955775691317662910">"Transferim te <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnry_disabled" msgid="3884684060443538097">"Çaktivizuar"</string>
<string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatori yt nuk mbështet çaktivizimin e transferimit të telefonatës kur telefoni nuk përgjigjet."</string>
<string name="labelCFNRc" msgid="2614827454402079766">"Kur është e paarritshme"</string>
- <string name="messageCFNRc" msgid="6380695421020295119">"Numri, nëse është i paarritshëm"</string>
+ <string name="messageCFNRc" msgid="6380695421020295119">"Numri, nëse linja është e paarritshme"</string>
<string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Transferim te <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Çaktivizuar"</string>
<string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatori yt nuk mbështet çaktivizimin e transferimit të telefonatës kur telefoni është i paarritshëm."</string>
@@ -132,9 +132,9 @@
<string name="disable" msgid="4678348128118573672">"Çaktivizo"</string>
<string name="change_num" msgid="239476305819844391">"Përditëso"</string>
<string-array name="clir_display_values">
- <item msgid="5560134294467334594">"I parazgjedhur nga rrjeti"</item>
- <item msgid="7876195870037833661">"Fshih numrin"</item>
- <item msgid="1108394741608734023">"Shfaq numrin"</item>
+ <item msgid="5560134294467334594">"E parazgjedhur nga rrjeti"</item>
+ <item msgid="7876195870037833661">"Fshihe numrin"</item>
+ <item msgid="1108394741608734023">"Shfaqe numrin"</item>
</string-array>
<string name="vm_changed" msgid="380744030726254139">"Numri i postës zanore ndryshoi"</string>
<string name="vm_change_failed" msgid="3352934863246208918">"Nuk mundi ta ndryshonte numrin e postës zanore.\nKontakto operatorin tënd nëse problemi vazhdon."</string>
@@ -326,20 +326,20 @@
<string name="cdma_activate_device" msgid="3793805892364814518">"Aktivizo"</string>
<string name="cdma_lte_data_service" msgid="4255018217292548962">"Konfiguro shërbimin e të dhënave"</string>
<string name="carrier_settings_title" msgid="9028166176523012300">"Cilësimet e operatorit"</string>
- <string name="fdn" msgid="7878832555095183202">"Numrat e telefonave fiks"</string>
- <string name="fdn_with_label" msgid="187084204115493366">"Numrat e telefonave fiks (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="manage_fdn_list" msgid="8777755791892122369">"Lista FDN"</string>
- <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
- <string name="fdn_activation" msgid="2156479741307463576">"Aktivizimi FDN"</string>
- <string name="fdn_enabled" msgid="5238109009915521240">"Numrat e telefonave fiks u aktivizuan"</string>
- <string name="fdn_disabled" msgid="4700049736675368279">"Numrat e telefonave fiks u çaktivizuan"</string>
+ <string name="fdn" msgid="7878832555095183202">"Numrat me telefonim të përzgjedhur"</string>
+ <string name="fdn_with_label" msgid="187084204115493366">"Numrat me telefonim të përzgjedhur (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="manage_fdn_list" msgid="8777755791892122369">"Lista e FDN-ve"</string>
+ <string name="fdn_list_with_label" msgid="7437232552210469217">"Lista e FDN-së (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="fdn_activation" msgid="2156479741307463576">"Aktivizimi i FDN-së"</string>
+ <string name="fdn_enabled" msgid="5238109009915521240">"Numrat me telefonim të përzgjedhur u aktivizuan"</string>
+ <string name="fdn_disabled" msgid="4700049736675368279">"Numrat me telefonim të përzgjedhur u çaktivizuan"</string>
<string name="enable_fdn" msgid="3740191529180493851">"Aktivizo FDN-në"</string>
<string name="disable_fdn" msgid="7944020890722540616">"Çaktivizo FDN-në"</string>
<string name="change_pin2" msgid="2153563695382176676">"Ndrysho PIN2-shin"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"Çaktivizo FDN-në"</string>
<string name="disable_fdn_ok" msgid="5727046928930740173">"Aktivizo FDN-në"</string>
- <string name="sum_fdn" msgid="1959399454900272878">"Menaxho numrat e telefonave fiks"</string>
- <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ndrysho PIN-in për qasje FDN"</string>
+ <string name="sum_fdn" msgid="1959399454900272878">"Menaxho numrat me telefonim të përzgjedhur"</string>
+ <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ndrysho PIN-in për qasje te FDN-ja"</string>
<string name="sum_fdn_manage_list" msgid="8431088265332628316">"Menaxho listën e numrave të telefonit"</string>
<string name="voice_privacy" msgid="3776841382844614716">"Privatësia e zërit"</string>
<string name="voice_privacy_summary" msgid="3159383389833516214">"Aktivizo modalitetin e privatësisë së përparuar"</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">"Refuzo"</string>
+ <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Injoro"</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">"<I pavendosur>"</string>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Telefonatë me Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Prek sërish për ta hapur"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Ndodhi një gabim gjatë dekodimit të mesazhit."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Një kartë SIM ka aktivizuar shërbimin tënd dhe ka përditësuar aftësitë e roaming-ut të telefonit tënd."</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 748cbd6..a63276c 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>
@@ -547,5 +547,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi позив"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Додирните поново да бисте отворили"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Дошло је до грешке при декодирању поруке."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM картица је активирала услугу и ажурирала функције роминга на телефону."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM картица је активирала услугу и ажурирала функције роминга на телефону."</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cbb7293..9cb4e70 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -90,8 +90,8 @@
<string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer som visas för utgående samtal"</string>
<string name="sum_default_caller_id" msgid="1954518825510901365">"Använd operatörens standardinställningar när mitt nummer visas för utgående samtal"</string>
<string name="labelCW" msgid="6120513814915920200">"Samtal väntar"</string>
- <string name="sum_cw_enabled" msgid="8083061901633671397">"Meddela mig om inkommande samtal under samtal"</string>
- <string name="sum_cw_disabled" msgid="3648693907300104575">"Meddela mig om inkommande samtal under samtal"</string>
+ <string name="sum_cw_enabled" msgid="8083061901633671397">"Meddela mig om inkommande samtal under pågående samtal"</string>
+ <string name="sum_cw_disabled" msgid="3648693907300104575">"Meddela mig om inkommande samtal under pågående samtal"</string>
<string name="call_forwarding_settings" msgid="3378927671091537173">"Inställningar för Vidarebefordra samtal"</string>
<string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Inställningar för vidarebefordran av samtal (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="labelCF" msgid="2574386948026924737">"Vidarebefordra samtal"</string>
@@ -102,7 +102,7 @@
<string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numret är inte tillgängligt"</string>
<string name="sum_cfu_disabled" msgid="8384177689501334080">"Av"</string>
<string name="labelCFB" msgid="6139853033106283172">"När det är upptaget"</string>
- <string name="messageCFB" msgid="3711089705936187129">"Nummer vid upptagen"</string>
+ <string name="messageCFB" msgid="3711089705936187129">"Använd nummer"</string>
<string name="sum_cfb_enabled" msgid="5984198104833116690">"Vidarebefordrar till <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
<string name="sum_cfb_disabled" msgid="4913145177320506827">"Av"</string>
<string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatören stöder inte inaktivering av vidarebefordran av samtal under pågående samtal."</string>
@@ -550,5 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi-samtal"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Tryck igen för att öppna"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Ett fel inträffade när meddelandet avkodades."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Ett SIM-kort har använts för att aktivera tjänsten och uppdatera roamingfunktionerna i mobilen."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Ett SIM-kort har använts för att aktivera tjänsten och uppdatera roamingfunktionerna i mobilen."</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 51e59d3..dad8948 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Simu ya Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Gusa tena ili ufungue"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Hitilafu imetokea wakati wa usimbuaji wa ujumbe."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM kadi yako imeanzisha huduma yako na kusasisha uwezo wa simu yako wa kutumia mitandao mingine."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM kadi yako imeanzisha huduma yako na kusasisha uwezo wa simu yako wa kutumia mitandao mingine."</string>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 8a03c9f..d8c43b5 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"வைஃபை அழைப்பு"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"திறக்க, மீண்டும் தட்டவும்"</string>
<string name="message_decode_error" msgid="3456481534066924855">"செய்தியைக் குறிவிலக்கும்போது பிழை ஏற்பட்டது."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ஏற்கனவே சிம் கார்டைப் பயன்படுத்தி சேவை இயக்கப்பட்டது மற்றும் மொபைலின் ரோமிங் செயல்திறன்கள் புதுப்பிக்கப்பட்டன."</string>
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 112f030..ad6960e 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -370,7 +370,7 @@
<string name="fdn_failed" msgid="540018079008319747">"FDN చర్య విఫలమైంది."</string>
<string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM కార్డు నుండి చదువుతోంది…"</string>
<string name="simContacts_empty" msgid="5270660846489561932">"మీ SIM కార్డులో పరిచయాలు ఏవీ లేవు."</string>
- <string name="simContacts_title" msgid="1861472842524839921">"దిగుమతి కోసం పరిచయాలు"</string>
+ <string name="simContacts_title" msgid="1861472842524839921">"దిగుమతికి పరిచయాల ఎంపిక"</string>
<string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM కార్డ్లోని పరిచయాలను దిగుమతి చేయడానికి ఎయిర్ప్లైన్ మోడ్ను ఆఫ్ చేయండి."</string>
<string name="enable_pin" msgid="5422767284133234860">"SIM PINను ప్రారంభించండి/నిలిపివేయండి"</string>
<string name="change_pin" msgid="9174186126330785343">"SIM PINను మార్చండి"</string>
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi కాల్"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"తెరవడానికి మళ్లీ తాకండి"</string>
<string name="message_decode_error" msgid="3456481534066924855">"సందేశాన్ని డీకోడ్ చేస్తున్నప్పుడు లోపం సంభవించింది."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM కార్డ్ మీ సేవను సక్రియం చేసింది మరియు మీ ఫోన్ రోమింగ్ సామర్థ్యాలను నవీకరించింది."</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bbf0d85..da8bac6 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"การโทรผ่าน Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"แตะอีกครั้งเพื่อเปิด"</string>
<string name="message_decode_error" msgid="3456481534066924855">"เกิดข้อผิดพลาดขณะถอดรหัสข้อความ"</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ซิมการ์ดได้เปิดใช้บริการของคุณและอัปเดตความสามารถในการโรมมิ่งของโทรศัพท์"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1dd5ed4..6891808 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">"Listahan ng FDN"</string>
+ <string name="fdnListLabel" msgid="8630418672279521003">"List 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">"Access Point Names"</string>
+ <string name="apn_settings" msgid="9043423184895642077">"Mga Access Point Name"</string>
<string name="settings_label" msgid="3876743539816984008">"Mga Setting ng Network"</string>
- <string name="phone_accounts" msgid="6376603393888116364">"Mga account sa pagtawag"</string>
+ <string name="phone_accounts" msgid="6376603393888116364">"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">"Mga karagdagang setting (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+ <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"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">"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="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="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">"Mga setting ng cellular network"</string>
+ <string name="mobile_networks" msgid="2843854043339307375">"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 ninanais na network"</string>
+ <string name="sum_select_automatically" msgid="5614890115123292400">"Awtomatikong pumili ng gustong 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 malalaking singil."</string>
+ <string name="roaming_warning" msgid="1603164667540144353">"Maaari kang magkaroon ng malaking bayarin."</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">"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="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="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 ang mga contact na ii-import"</string>
+ <string name="simContacts_title" msgid="1861472842524839921">"Piliin mga contact na i-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>
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Tawag sa Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Pinduting muli upang buksan"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Nagkaroon ng error habang dine-decode ang mensahe."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Na-activate ng isang SIM card ang iyong serbisyo at na-update ang mga kakayahang roaming ng iyong telepono."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Na-activate ng isang SIM card ang iyong serbisyo at na-update ang mga kakayahang roaming ng iyong telepono."</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 585a840..7e25ff1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Kablosuz çağrı"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Açmak için tekrar dokunun"</string>
<string name="message_decode_error" msgid="3456481534066924855">"İletinin kodu çözülürken bir hata oluştu."</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Bir SIM kart, hizmetinizi etkinleştirdi ve telefonunuzun dolaşım özelliklerini güncelledi."</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 265c055..54fb904 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -42,7 +42,7 @@
<string name="pause_prompt_yes" msgid="3564467212025151797">"Так"</string>
<string name="pause_prompt_no" msgid="6686238803236884877">"Ні"</string>
<string name="wild_prompt_str" msgid="5543521676355533577">"Замінити довільний символ на"</string>
- <string name="no_vm_number" msgid="4164780423805688336">"Відстун. номер голос. пошти"</string>
+ <string name="no_vm_number" msgid="4164780423805688336">"Відстуній номер голосової пошти"</string>
<string name="no_vm_number_msg" msgid="1300729501030053828">"На SIM-карті немає збереж. номерів голос. пошти."</string>
<string name="add_vm_number_str" msgid="4676479471644687453">"Додати номер"</string>
<string name="puk_unlocked" msgid="2284912838477558454">"Вашу SIM-карту розблоковано. Ваш телефон розблоковується..."</string>
@@ -72,7 +72,7 @@
<string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Виберіть, з яких облікових записів можна телефонувати"</string>
<string name="wifi_calling" msgid="739018212480165598">"Дзвінки через Wi-Fi"</string>
<string name="connection_service_default_label" msgid="1498481943805913754">"Вбудована служба під’єднання"</string>
- <string name="voicemail" msgid="8693759337917898954">"Голос. пошта"</string>
+ <string name="voicemail" msgid="8693759337917898954">"Голосова пошта"</string>
<string name="voicemail_settings_with_label" msgid="152724978380748296">"Голосова пошта (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
<string name="voicemail_abbreviated" msgid="2215592488517217448">"ГП:"</string>
<string name="networks" msgid="8873030692174541976">"Оператори мережі"</string>
@@ -136,14 +136,14 @@
<item msgid="7876195870037833661">"Сховати номер"</item>
<item msgid="1108394741608734023">"Показувати номер"</item>
</string-array>
- <string name="vm_changed" msgid="380744030726254139">"Номер голос. пошти змінено."</string>
+ <string name="vm_changed" msgid="380744030726254139">"Номер голосової пошти змінено."</string>
<string name="vm_change_failed" msgid="3352934863246208918">"Не вдалося змінити номер голосової пошти.\nЗв’яжіться зі своїм оператором, якщо проблема не зникне."</string>
<string name="fw_change_failed" msgid="5298103228470214665">"Не вдалося змінити номер переадресації.\nЗв’яжіться зі своїм оператором, якщо проблема не зникне."</string>
<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="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>
@@ -407,7 +407,7 @@
<string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-код більше не заблоковано"</string>
<string name="pin2_error_exception" msgid="1088689322248996699">"Помилка мережі або SIM-карти"</string>
<string name="doneButton" msgid="2859593360997984240">"Готово"</string>
- <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер голос. пошти"</string>
+ <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер голосової пошти"</string>
<string name="card_title_dialing" msgid="5769417478498348054">"Набір номера"</string>
<string name="card_title_redialing" msgid="8253487008234167266">"Повторний набір"</string>
<string name="card_title_conf_call" msgid="1162980346189744501">"Конференц-виклик"</string>
@@ -416,10 +416,10 @@
<string name="card_title_on_hold" msgid="821463117892339942">"Очікує"</string>
<string name="card_title_hanging_up" msgid="3999101620995182450">"Класти слухавку"</string>
<string name="card_title_in_call" msgid="6346543933068225205">"Вхід. викл."</string>
- <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова голос. пошта"</string>
- <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова голос. пошта (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+ <string name="notification_voicemail_title" msgid="8933468752045550523">"Нове голосове повідомлення"</string>
+ <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нове голосове повідомлення (<xliff:g id="COUNT">%d</xliff:g>)"</string>
<string name="notification_voicemail_text_format" msgid="4447323569453981685">"Набрати <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
- <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Невідомий номер голос. пошти"</string>
+ <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Невідомий номер голосової пошти"</string>
<string name="notification_network_selection_title" msgid="4224455487793492772">"Нема служби"</string>
<string name="notification_network_selection_text" msgid="2607085729661923269">"Вибрана мережа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недоступна"</string>
<string name="incall_error_power_off" msgid="2947938060513306698">"Щоб зателефонувати, вимкніть режим польоту."</string>
@@ -550,5 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Дзвінок через Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Торкніться знову, щоб відкрити"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Під час розшифрування повідомлення сталася помилка."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Коли ви вставили SIM-карту, було активовано мобільний зв’язок і оновлено можливості роумінгу вашого телефона."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Коли ви вставили SIM-карту, було активовано мобільний зв’язок і оновлено можливості роумінгу вашого телефона."</string>
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 604b497..3e54498 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi کال"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"کھولنے کیلئے دوبارہ ٹچ کریں"</string>
<string name="message_decode_error" msgid="3456481534066924855">"پیغام کو ڈیکوڈ کرتے وقت ایک خرابی پیش آ گئی۔"</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"ایک SIM کارڈ نے آپ کی سروس فعال کر دی ہے اور آپ کے فون کی رومنگ اہلیتیں اپ ڈیٹ کر دی ہیں۔"</string>
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 27a3f6a..5130596 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 nuqtasi nomlari"</string>
+ <string name="apn_settings" msgid="9043423184895642077">"Ulanish nuqtalari (APN)"</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">"Telefoningiz ilovasining ruxsat berilgan raqamlar sozlamalari yoqildi. Natijada, ba’zi qo‘ng‘iroq qilish tegishli xususiyatlar ishlamaydi."</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="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 izlash"</string>
+ <string name="search_networks" msgid="1601136049300882441">"Tarmoqlarni qidirish"</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 izlash"</string>
+ <string name="sum_search_networks" msgid="2921092249873272715">"Barcha mavjud tarmoqlarni qidirish"</string>
<string name="select_automatically" msgid="5628402124471810174">"Avtomatik tanlash"</string>
- <string name="sum_select_automatically" msgid="5614890115123292400">"Siz xohlagan tarmoqni avtomatik tanlash"</string>
+ <string name="sum_select_automatically" msgid="5614890115123292400">"Afzal 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">"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" 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_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">"Roumingdan foydalanish xarajati ancha yuqori bo‘lishi mumkin."</string>
+ <string name="roaming_warning" msgid="1603164667540144353">"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">"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" 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_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 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="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="disable_fdn" msgid="7944020890722540616">"FDNni o‘chirib qo‘yish"</string>
- <string name="change_pin2" msgid="2153563695382176676">"PIN2 kodni o‘zgartiring"</string>
+ <string name="change_pin2" msgid="2153563695382176676">"PIN2-kodni o‘zgartirish"</string>
<string name="enable_fdn_ok" msgid="7215588870329688132">"FDNni o‘chirib qo‘yish"</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="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="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 noto‘g‘ri PIN kod kiritdingiz."</string>
+ <string name="pin2_invalid" msgid="5470854099230755944">"FDN yangilanmadi, chunki siz PIN-kodni noto‘g‘ri 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 kartangizda kontaktlar yo‘q."</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_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 kod"</string>
+ <string name="oldPin2Label" msgid="8559146795026261502">"Eski PIN2"</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,11 +538,11 @@
<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>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Ochish uchun yana bosing"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Xabarni kodsizlashda xatolik yuz berdi."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM-karta xizmatni faollashtirgan hamda telefonning rouming imkoniyatlarini yangilagan."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Telefoningizda rouming xizmati sozlangan va SIM-karta faollashtirilgan."</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index da9e9d8..4ae9245 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -544,5 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Cuộc gọi qua Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Chạm lại để mở"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Đã xảy ra lỗi khi giải mã tin nhắn."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Thẻ SIM đã kích hoạt dịch vụ của bạn và đã cập nhật chức năng chuyển vùng của điện thoại."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Thẻ SIM đã kích hoạt dịch vụ của bạn và đã cập nhật chức năng chuyển vùng của điện thoại."</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 846fb7a..dcc4178 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -544,6 +544,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"WLAN 通话"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"再次触摸即可打开"</string>
<string name="message_decode_error" msgid="3456481534066924855">"对邮件解码时出错。"</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM 卡已启用您的服务，并更新了您手机的漫游功能。"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 88405e9..41cb71d 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -550,5 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi 通話"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"再次輕觸以開啟"</string>
<string name="message_decode_error" msgid="3456481534066924855">"為訊息解碼時發生錯誤。"</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"SIM 卡已啟動您的服務，並更新了您的手機漫遊功能。"</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM 卡已啟動您的服務，並更新了您的手機漫遊功能。"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2587408..26a2bcd 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -101,7 +101,7 @@
<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="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>
@@ -550,6 +550,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Wi-Fi 通話"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"再次輕觸即可開啟"</string>
<string name="message_decode_error" msgid="3456481534066924855">"為郵件解碼時發生錯誤。"</string>
- <!-- no translation found for callFailed_cdma_activation_ (7865724396309578840) -->
- <skip />
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"SIM 卡已啟用您的服務並更新了手機的漫遊功能。"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e9038fe..be66865 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -548,5 +548,5 @@
<string name="status_hint_label_wifi_call" msgid="8900805254974653903">"Ikholi ye-Wi-Fi"</string>
<string name="emergency_action_launch_hint" msgid="5841511849007540970">"Thinta futhi ukuze uvule"</string>
<string name="message_decode_error" msgid="3456481534066924855">"Kube nephutha ngenkathi kukhishwa ikhodi kumlayezo."</string>
- <string name="callFailed_cdma_activation_" msgid="7865724396309578840">"Ikhadi le-SIM lenze kwasebenza isevisi yakho laphinde labuyekeza amakhono wokuzula wefoni yakho."</string>
+ <string name="callFailed_cdma_activation" msgid="2307989779233262164">"Ikhadi le-SIM lenze kwasebenza isevisi yakho laphinde labuyekeza amakhono okuzula wefoni yakho."</string>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 61af525..c0e808d 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -14,6 +14,11 @@
limitations under the License.
-->
+<!-- NOTE: Many variables that used to be in this file have been migrated to
+ CarrierConfigManager.java. Please consider whether new variables belong
+ there before adding to this file. Variables here should be more closely
+ related to devices than to networks. -->
+
<!-- Phone app resources that may need to be customized
for different hardware or product builds. -->
<resources>
@@ -21,6 +26,7 @@
EVENT_SIM_NETWORK_LOCKED events from the Sim. If true, this will
prevent the IccNetworkDepersonalizationPanel from being shown,
and effectively disable the "Sim network lock" feature. -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL -->
<bool name="ignore_sim_network_locked_events">false</bool>
<!-- Flag indicating whether the Phone app should provide
@@ -31,6 +37,7 @@
(One important consequence: there will be no way to make an
Emergency Call if your SIM is network-locked and you don't know
the PIN.) -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL -->
<bool name="sim_network_unlock_allow_dismiss">true</bool>
<!-- OTA configuration values, used when provisioning CDMA devices.
@@ -51,6 +58,7 @@
<integer name="OtaPlaySuccessFailureTone">0</integer>
<!-- Flag indicating if the phone is a world phone -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_WORLD_PHONE_BOOL -->
<bool name="world_phone">false</bool>
<!-- If true, enable vibration (haptic feedback) for key presses
@@ -59,25 +67,30 @@
consistent with the regular Dialer, this value should agree
with the corresponding values from config.xml under
apps/Contacts. -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL -->
<bool name="config_enable_dialer_key_vibration">true</bool>
<!-- Flag indicating if hac is enabled -->
<bool name="hac_enabled">false</bool>
<!-- Flag indicating if dtmf tone type is enabled -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_DTMF_TYPE_ENABLED_BOOL -->
<bool name="dtmf_type_enabled">false</bool>
<!-- Flag indicating if auto retry is enabled -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_AUTO_RETRY_ENABLED_BOOL -->
<bool name="auto_retry_enabled">false</bool>
<!-- Determine whether we want to play local DTMF tones in a call, or
just let the radio/BP handle playing of the tones. -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_ALLOW_LOCAL_DTMF_TONES_BOOL -->
<bool name="allow_local_dtmf_tones">true</bool>
<!-- If true, show an onscreen "Dial" button in the dialer.
In practice this is used on all platforms, even the ones with hard SEND/END
keys, but for maximum flexibility it's controlled by a flag here
(which can be overridden on a per-product basis.) -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL -->
<bool name="config_show_onscreen_dial_button">true</bool>
<!-- Determine whether calls to mute the microphone in PhoneUtils
@@ -86,6 +99,7 @@
<bool name="send_mic_mute_to_AudioManager">false</bool>
<!-- Determines if device implements a noise suppression device for in call audio-->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL -->
<bool name="has_in_call_noise_suppression">false</bool>
<!-- Determines if the current device should allow emergency numbers
@@ -99,26 +113,33 @@
up the exact date/time of an emergency call. So perhaps we
*should* log those calls, but instead fix the call log to disable
the "call" button for emergency numbers. -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL -->
<bool name="allow_emergency_numbers_in_call_log">false</bool>
<!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
able to prevent manual operator selection. If false, this SIM setting will be
ignored and manual operator selection will always be available. See
CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_CSP_ENABLED_BOOL -->
<bool name="csp_enabled">false</bool>
<!-- If true, removes the Voice Privacy option from Call Settings -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_VOICE_PRIVACY_DISABLE_UI_BOOL -->
<bool name="config_voice_privacy_disable">false</bool>
<!-- Configure certain GsmUmtsOptions to be available or not. The
default values are in Phone/res/values/config.xml and maybe overridden
in operator specific resource directories or device specific overlays. -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_APN_EXPAND_BOOL -->
<bool name="config_apn_expand" translatable="false">true</bool>
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_OPERATOR_SELECTION_EXPAND_BOOL -->
<bool name="config_operator_selection_expand" translatable="false">true</bool>
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_PREFER_2G_BOOL -->
<bool name="config_prefer_2g" translatable="false">true</bool>
<!-- Show enabled lte option for lte device -->
<bool name="config_enabled_lte" translatable="false">false</bool>
<!-- Show cdma auto network mode in (glabal) roaming -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_SHOW_CDMA_CHOICES_BOOL -->
<bool name="config_show_cdma" translatable="false">false</bool>
<!-- Package name for the default in-call UI and dialer [DO NOT TRANSLATE] -->
@@ -128,23 +149,28 @@
<string name="dialer_default_class" translatable="false">com.android.dialer.DialtactsActivity</string>
<!-- CDMA activation goes through HFA -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_USE_HFA_FOR_PROVISIONING_BOOL -->
<bool name="config_use_hfa_for_provisioning">false</bool>
<!-- CDMA activation goes through OTASP.
TODO: This should be combined with config_use_hfa_for_provisioning and implemented
as an enum (NONE, HFA, OTASP). -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_USE_OTASP_FOR_PROVISIONING_BOOL -->
<bool name="config_use_otasp_for_provisioning">false</bool>
<!-- Display carrier settings menu if true -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_CARRIER_SETTINGS_ENABLE_BOOL -->
<bool name="config_carrier_settings_enable">false</bool>
<!-- carrier settings menu -->
<string name="carrier_settings" translatable="false"></string>
<string name="carrier_settings_menu" translatable="false"></string>
<!-- Does not display additional call seting for IMS phone based on GSM Phone -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_ADDITIONAL_CALL_SETTING_BOOL -->
<bool name="config_additional_call_setting">true</bool>
<!-- Show APN Settings for some CDMA carriers -->
+ <!-- DEPRECATED: Use CarrierConfigManager#KEY_SHOW_APN_SETTING_CDMA_BOOL -->
<bool name="config_show_apn_setting_cdma">false</bool>
<!-- Allows the telephony HFA logic to run even if we're not in setup wizard. -->
@@ -157,9 +183,6 @@
If true, the voicemail notifications cannot be dismissed from the notification bar. -->
<bool name="voicemail_notification_persistent">false</bool>
- <!-- For IMS video over LTE calls, determines whether video pause signalling is supported. -->
- <bool name="support_pause_ims_video_calls" translatable="false">true</bool>
-
<!-- Disables dialing "*228" (OTASP provisioning) on CDMA carriers where it is not supported or
is potentially harmful by locking the SIM to 3G. -->
<string name="config_disable_cdma_activation_code" translatable="false">false</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ab074e4..1ce9e9c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1283,7 +1283,7 @@
<string name="message_decode_error">There was an error while decoding the message.</string>
<!-- Call failure reason: SIM card and roaming capabilities have already been activated. [CHAR LIMIT=NONE]-->
- <string name="callFailed_cdma_activation_">
+ <string name="callFailed_cdma_activation">
A SIM card has activated your service and updated your phone\'s roaming capabilities.
</string>
diff --git a/sip/res/values-bg/strings.xml b/sip/res/values-bg/strings.xml
index 0b511c5..b465464 100644
--- a/sip/res/values-bg/strings.xml
+++ b/sip/res/values-bg/strings.xml
@@ -21,7 +21,7 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"Профили"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Получаване на входящи обаждания"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Изразходва повече от батерията"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Използване на услуга за обаждане през SIP"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Използване на обаждане през SIP"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Използване на услуга за обаждане през SIP (само при Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"За всички обаждания, когато е налице мрежа за данни"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"Само за обаждания през SIP"</string>
diff --git a/sip/res/values-ca/strings.xml b/sip/res/values-ca/strings.xml
index a744ccb..4a22672 100644
--- a/sip/res/values-ca/strings.xml
+++ b/sip/res/values-ca/strings.xml
@@ -21,8 +21,8 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"Comptes"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Rep trucades entrants"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Fa servir més bateria."</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Ús de les trucades SIP"</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Ús de les trucades SIP (només Wi-Fi)"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Fes servir trucades SIP"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Fes servir trucades SIP (només Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Per a totes les trucades quan hi hagi xarxes de dades disponibles"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"Només per a trucades SIP"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Per a totes les trucades"</string>
@@ -57,7 +57,7 @@
<string name="proxy_address_title" msgid="6890163365640631841">"Adreça de servidor intermediari de sortida"</string>
<string name="port_title" msgid="6693965912656593862">"Número de port"</string>
<string name="transport_title" msgid="889155457465372527">"Tipus de transport"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Envia mantenir en línia"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Mantén connexió"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Configuració opcional"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Nom d\'usuari per a l\'autenticació"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Nom d\'usuari utilitzat per a l\'autenticació"</string>
diff --git a/sip/res/values-cs/strings.xml b/sip/res/values-cs/strings.xml
index 7d66537..fdb0e50 100644
--- a/sip/res/values-cs/strings.xml
+++ b/sip/res/values-cs/strings.xml
@@ -21,8 +21,8 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"Účty"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Přijímat příchozí hovory"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Více vybíjí baterii"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Použít volání SIP"</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Použít volání SIP (pouze Wi-Fi)"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Používat volání SIP"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Používat volání SIP (pouze Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Pro všechny hovory, pokud je k dispozici datová síť"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"Pouze pro volání SIP"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Pro všechny hovory"</string>
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Registrace účtu se nezdařila: nesprávné uživatelské jméno nebo heslo."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registrace účtu se nezdařila. Zkontrolujte prosím název serveru."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"Tento účet je aktuálně používán aplikací <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"Podrobnosti o účtu SIP"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"Podrobnosti o účtu SIP"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"Účet SIP"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"Účet SIP"</string>
<string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
<string name="username_title" msgid="6770064611005663470">"Uživatelské jméno"</string>
<string name="password_title" msgid="5289013731515564295">"Heslo"</string>
diff --git a/sip/res/values-da/strings.xml b/sip/res/values-da/strings.xml
index 628a677..462435e 100644
--- a/sip/res/values-da/strings.xml
+++ b/sip/res/values-da/strings.xml
@@ -53,14 +53,14 @@
<string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
<string name="username_title" msgid="6770064611005663470">"Brugernavn"</string>
<string name="password_title" msgid="5289013731515564295">"Adgangskode"</string>
- <string name="display_name_title" msgid="579241787583079773">"Visningsnavn"</string>
+ <string name="display_name_title" msgid="579241787583079773">"Vist navn"</string>
<string name="proxy_address_title" msgid="6890163365640631841">"Udgående proxyadresse"</string>
<string name="port_title" msgid="6693965912656593862">"Portnummer"</string>
<string name="transport_title" msgid="889155457465372527">"Transporttype"</string>
<string name="send_keepalive_title" msgid="599627072150501159">"Send keepalive"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Valgfri indstillinger"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Brugernavn til godkendelse"</string>
- <string name="auth_username_summary" msgid="941160241371436473">"Brugernavn bruges til godkendelse"</string>
+ <string name="auth_username_summary" msgid="941160241371436473">"Brugernavn ved godkendelse"</string>
<string name="default_preference_summary" msgid="1979249643719483249">"<Ikke angivet>"</string>
<string name="display_name_summary" msgid="7155076491675565407">"<Samme som brugernavn>"</string>
<string name="optional_summary" msgid="2363105560396317624">"<Valgfrit>"</string>
diff --git a/sip/res/values-es/strings.xml b/sip/res/values-es/strings.xml
index e100616..ad97696 100644
--- a/sip/res/values-es/strings.xml
+++ b/sip/res/values-es/strings.xml
@@ -21,7 +21,7 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"Cuentas"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Recibir llamadas"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Consume más batería"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Usar llamadas SIP"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Usar SIP"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Usar llamadas SIP (solo con Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para todas las llamadas cuando haya redes de datos disponibles"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"Solo para llamadas SIP"</string>
@@ -57,7 +57,7 @@
<string name="proxy_address_title" msgid="6890163365640631841">"Dirección de servidor proxy saliente"</string>
<string name="port_title" msgid="6693965912656593862">"Número de puerto"</string>
<string name="transport_title" msgid="889155457465372527">"Tipo de transporte"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Enviar mensajes de mantenimiento de la conexión"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Mantener conexión"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Ajustes opcionales"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Nombre de usuario de autenticación"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Nombre de usuario utilizado para la autenticación"</string>
@@ -65,7 +65,7 @@
<string name="display_name_summary" msgid="7155076491675565407">"<Igual que el nombre de usuario>"</string>
<string name="optional_summary" msgid="2363105560396317624">"<Opcional>"</string>
<string name="advanced_settings_show" msgid="7838761602853998622">"▷ Tocar para mostrar todo"</string>
- <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Tocar para ocultar todo"</string>
+ <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Toca para ocultar todo"</string>
<string name="empty_alert" msgid="6659484914371384024">"El campo <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> es obligatorio y no se puede dejar en blanco."</string>
<string name="not_a_valid_port" msgid="7931422555587011830">"El número de puerto debe estar comprendido entre 1.000 y 65.534."</string>
<string name="no_internet_available" msgid="5523747991760017298">"Antes de realizar una llamada SIP, comprueba tu conexión a Internet."</string>
diff --git a/sip/res/values-fr/strings.xml b/sip/res/values-fr/strings.xml
index 1007751..a98533e 100644
--- a/sip/res/values-fr/strings.xml
+++ b/sip/res/values-fr/strings.xml
@@ -57,7 +57,7 @@
<string name="proxy_address_title" msgid="6890163365640631841">"Adresse de proxy sortant"</string>
<string name="port_title" msgid="6693965912656593862">"Numéro de port"</string>
<string name="transport_title" msgid="889155457465372527">"Type de transport"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Envoyer un keep-alive"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Envoyer un message keepalive"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Paramètres facultatifs"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Nom d\'utilisateur d\'authentification"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Nom d\'utilisateur utilisé pour l\'authentification"</string>
diff --git a/sip/res/values-hr/strings.xml b/sip/res/values-hr/strings.xml
index 042cbae..49d6970 100644
--- a/sip/res/values-hr/strings.xml
+++ b/sip/res/values-hr/strings.xml
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Registracija računa nije uspjela: netočno korisničko ime ili zaporka."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registracija računa nije uspjela: provjerite naziv poslužitelja."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"Ovaj račun trenutačno upotrebljava aplikacija <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"Pojedinosti SIP računa"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"Pojedinosti SIP računa"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"O SIP računu"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"O SIP računu"</string>
<string name="domain_address_title" msgid="1968479941328225423">"Poslužitelj"</string>
<string name="username_title" msgid="6770064611005663470">"Korisničko ime"</string>
<string name="password_title" msgid="5289013731515564295">"Zaporka"</string>
diff --git a/sip/res/values-in/strings.xml b/sip/res/values-in/strings.xml
index e4129a4..d217120 100644
--- a/sip/res/values-in/strings.xml
+++ b/sip/res/values-in/strings.xml
@@ -56,7 +56,7 @@
<string name="display_name_title" msgid="579241787583079773">"Nama tampilan"</string>
<string name="proxy_address_title" msgid="6890163365640631841">"Alamat proxy di luar"</string>
<string name="port_title" msgid="6693965912656593862">"Nomor port"</string>
- <string name="transport_title" msgid="889155457465372527">"Jenis transportasi"</string>
+ <string name="transport_title" msgid="889155457465372527">"Jenis transpor"</string>
<string name="send_keepalive_title" msgid="599627072150501159">"Kirim keep-alive"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Setelan opsional"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Nama pengguna autentikasi"</string>
diff --git a/sip/res/values-ja/strings.xml b/sip/res/values-ja/strings.xml
index b89dbec..70d59bf 100644
--- a/sip/res/values-ja/strings.xml
+++ b/sip/res/values-ja/strings.xml
@@ -20,7 +20,7 @@
<string name="sip_accounts" msgid="85559497282185405">"SIPアカウント"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"アカウント"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"着信を受ける"</string>
- <string name="sip_receive_calls_summary" msgid="946161517528227523">"電池の使用量が増えます"</string>
+ <string name="sip_receive_calls_summary" msgid="946161517528227523">"電池の使用量が増加"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"SIP通話の使用"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP通話の使用（Wi-Fiのみ）"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"データネットワーク接続時はすべての通話"</string>
diff --git a/sip/res/values-kk-rKZ/strings.xml b/sip/res/values-kk-rKZ/strings.xml
index 76c54c8..379e7df 100644
--- a/sip/res/values-kk-rKZ/strings.xml
+++ b/sip/res/values-kk-rKZ/strings.xml
@@ -21,7 +21,7 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"Есептік жазбалар"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Кіріс қоңырауларды қабылдау"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Көбірек батарея қуатын пайдаланады"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"SIP қоңырауларын пайдалану"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"SIP қызметін пайдалану"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP қоңырауларын пайдалану (тек Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Деректер желісі қол жетімді болғанда барлық қоңыраулар үшін"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"Тек SIP қоңыраулары үшін"</string>
@@ -57,7 +57,7 @@
<string name="proxy_address_title" msgid="6890163365640631841">"Шығыс прокси мекенжайы"</string>
<string name="port_title" msgid="6693965912656593862">"Порт нөмірі"</string>
<string name="transport_title" msgid="889155457465372527">"Тасымалдау түрі"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Байланыс сақтау сигналын жіберу"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Keep-alive жіберу"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Қосымша параметрлер"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Аутентификациялау пайдаланушы аты"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Аутентификациялау үшін пайдаланылатын пайдаланушы аты"</string>
diff --git a/sip/res/values-lt/strings.xml b/sip/res/values-lt/strings.xml
index 7ce074c..b340e3b 100644
--- a/sip/res/values-lt/strings.xml
+++ b/sip/res/values-lt/strings.xml
@@ -19,7 +19,7 @@
<string name="sip_settings" msgid="3768482698061677257">"SIP nustatymai"</string>
<string name="sip_accounts" msgid="85559497282185405">"SIP paskyros"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"Paskyros"</string>
- <string name="sip_receive_calls" msgid="426678617137462173">"Gauti gaunamus skambučius"</string>
+ <string name="sip_receive_calls" msgid="426678617137462173">"Gauti gaunamuosius skambučius"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Eikvojama daugiau akumuliatoriaus energijos"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"Naudoti SIP skambinimą"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Naudoti SIP skambinimą (tik „Wi-Fi“)"</string>
@@ -32,7 +32,7 @@
<string name="saving_account" msgid="5336529880235177448">"Išsaugoma paskyra..."</string>
<string name="removing_account" msgid="5537351356808985756">"Pašalinama paskyra..."</string>
<string name="sip_menu_save" msgid="7882219814563869225">"Išsaugoti"</string>
- <string name="sip_menu_discard" msgid="2350421645423888438">"Išmesti"</string>
+ <string name="sip_menu_discard" msgid="2350421645423888438">"Atmesti"</string>
<string name="alert_dialog_close" msgid="1326011828713435134">"Uždaryti profilį"</string>
<string name="alert_dialog_ok" msgid="4752048404605388940">"Gerai"</string>
<string name="close_profile" msgid="3122414058856309881">"Uždaryti"</string>
diff --git a/sip/res/values-lv/strings.xml b/sip/res/values-lv/strings.xml
index b1337b5..0e6b541 100644
--- a/sip/res/values-lv/strings.xml
+++ b/sip/res/values-lv/strings.xml
@@ -56,12 +56,12 @@
<string name="display_name_title" msgid="579241787583079773">"Parādāmais nosaukums"</string>
<string name="proxy_address_title" msgid="6890163365640631841">"Izejošā starpniekservera adrese"</string>
<string name="port_title" msgid="6693965912656593862">"Porta numurs"</string>
- <string name="transport_title" msgid="889155457465372527">"Transporta veids"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Saites darbības pārbaudes ziņojuma sūtīšana"</string>
+ <string name="transport_title" msgid="889155457465372527">"Protokols"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Saites darbības pārb. ziņ. sūtīšana"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Neobligāti iestatījumi"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Autentifikācijai izmantotais lietotājvārds"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Autentifikācijai izmantotais lietotājvārds"</string>
- <string name="default_preference_summary" msgid="1979249643719483249">"<Nav iestatītas>"</string>
+ <string name="default_preference_summary" msgid="1979249643719483249">"<Nav iestatīts>"</string>
<string name="display_name_summary" msgid="7155076491675565407">"<Tāds pats kā lietotājvārds>"</string>
<string name="optional_summary" msgid="2363105560396317624">"<Neobligāti>"</string>
<string name="advanced_settings_show" msgid="7838761602853998622">"▷ Pieskarieties, lai rādītu visu"</string>
diff --git a/sip/res/values-ml-rIN/strings.xml b/sip/res/values-ml-rIN/strings.xml
index 814f2a6..87e2549 100644
--- a/sip/res/values-ml-rIN/strings.xml
+++ b/sip/res/values-ml-rIN/strings.xml
@@ -19,14 +19,14 @@
<string name="sip_settings" msgid="3768482698061677257">"SIP ക്രമീകരണങ്ങൾ"</string>
<string name="sip_accounts" msgid="85559497282185405">"SIP അക്കൗണ്ടുകൾ"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"അക്കൗണ്ടുകൾ"</string>
- <string name="sip_receive_calls" msgid="426678617137462173">"ഇൻകമിംഗ് കോളുകൾ സ്വീകരിക്കുക"</string>
+ <string name="sip_receive_calls" msgid="426678617137462173">"ഇൻകമിംഗ് കോൾ സ്വീകരിക്കൂ"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"കൂടുതൽ ബാറ്ററി ആയുസ് ഉപയോഗിക്കുന്നു"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"SIP കോൾചെയ്യൽ ഉപയോഗിക്കുക"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP കോൾചെയ്യൽ ഉപയോഗിക്കുക (Wi-Fi മാത്രം)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"ഡാറ്റ നെറ്റ്വർക്ക് ലഭ്യമാകുമ്പോൾ എല്ലാ കോളുകൾക്കായും"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"SIP കോളുകൾക്ക് മാത്രം"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"എല്ലാ കോളുകൾക്കും"</string>
- <string name="add_sip_account" msgid="800843669753980091">"അക്കൗണ്ട് ചേർക്കുക"</string>
+ <string name="add_sip_account" msgid="800843669753980091">"ചേർക്കുക"</string>
<string name="remove_sip_account" msgid="1367664438506503690">"അക്കൗണ്ട് നീക്കംചെയ്യുക"</string>
<string name="sip_account_list" msgid="5610858485304821480">"SIP അക്കൗണ്ടുകൾ"</string>
<string name="saving_account" msgid="5336529880235177448">"അക്കൗണ്ട് സംരക്ഷിക്കുന്നു…"</string>
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"അക്കൗണ്ട് രജിസ്ട്രേഷൻ പരാജയപ്പെട്ടു. ഉപയോക്തൃനാമമോ പാസ്വേഡോ തെറ്റാണ്."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"അക്കൗണ്ട് രജിസ്ട്രേഷൻ പരാജയപ്പെട്ടു: സെർവറിന്റെ പേര് പരിശോധിക്കുക."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"ഈ അക്കൗണ്ട് നിലവിൽ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> അപ്ലിക്കേഷൻ ഉപയോഗിക്കുന്നു."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"SIP അക്കൗണ്ട് വിശദാംശങ്ങൾ"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"SIP അക്കൗണ്ട് വിശദാംശങ്ങൾ"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"SIP വിശദാംശം"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"SIP വിശദാംശം"</string>
<string name="domain_address_title" msgid="1968479941328225423">"സെർവർ"</string>
<string name="username_title" msgid="6770064611005663470">"ഉപയോക്തൃനാമം"</string>
<string name="password_title" msgid="5289013731515564295">"പാസ്വേഡ്"</string>
@@ -57,7 +57,7 @@
<string name="proxy_address_title" msgid="6890163365640631841">"ഔട്ട്ബൗണ്ട് പ്രോക്സി വിലാസം"</string>
<string name="port_title" msgid="6693965912656593862">"പോർട്ട് നമ്പർ"</string>
<string name="transport_title" msgid="889155457465372527">"ട്രാൻസ്പോർട്ട് തരം"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"സജീവമായി തുടരുക എന്നത് അയയ്ക്കുക"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"\'സജീവമായി തുടരുക\'യെന്ന് അയയ്ക്കുക"</string>
<string name="advanced_settings" msgid="6622996380747040711">"ഓപ്ഷണൽ ക്രമീകരണങ്ങൾ"</string>
<string name="auth_username_title" msgid="8262491689004708265">"പ്രാമാണീകരണ ഉപയോക്തൃനാമം"</string>
<string name="auth_username_summary" msgid="941160241371436473">"പ്രാമാണീകരണത്തിന് ഉപയോഗിച്ച ഉപയോക്തൃനാമം"</string>
diff --git a/sip/res/values-nb/strings.xml b/sip/res/values-nb/strings.xml
index 5f8501c..0d563e8 100644
--- a/sip/res/values-nb/strings.xml
+++ b/sip/res/values-nb/strings.xml
@@ -21,10 +21,10 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"Kontoer"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Motta innkommende anrop"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Bruker mer batterilevetid"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Bruk SIP-oppringing"</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Bruk SIP-oppringing (kun for Wi-Fi)"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Bruk SIP-anrop"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Bruk SIP-anrop (kun for Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"For alle anrop hvor datanettverk er tilgjengelige"</string>
- <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Kun for SIP-oppringing"</string>
+ <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Kun for SIP-anrop"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Bruk ved alle anrop"</string>
<string name="add_sip_account" msgid="800843669753980091">"Legg til konto"</string>
<string name="remove_sip_account" msgid="1367664438506503690">"Fjern kontoen"</string>
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Kontoregistreringen mislyktes: feil brukernavn eller passord."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"Kontoregistreringen mislyktes: sjekk tjenernavnet."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"Denne kontoen er for øyeblikket i bruk av appen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"Kontoinnstillinger for SIP"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"Kontoinnstillinger for SIP"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"SIP-innstillinger"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"SIP-innstillinger"</string>
<string name="domain_address_title" msgid="1968479941328225423">"Tjener"</string>
<string name="username_title" msgid="6770064611005663470">"Brukernavn"</string>
<string name="password_title" msgid="5289013731515564295">"Passord"</string>
@@ -57,10 +57,10 @@
<string name="proxy_address_title" msgid="6890163365640631841">"Adresse for utgående proxy-tjener"</string>
<string name="port_title" msgid="6693965912656593862">"Portnummer"</string>
<string name="transport_title" msgid="889155457465372527">"Transporttype"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Send hold-aktiv-meldinger"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Send keep-alive-meldinger"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Valgfrie innstillinger"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Brukernavn for autentisering"</string>
- <string name="auth_username_summary" msgid="941160241371436473">"Brukernavn brukes til autentisering"</string>
+ <string name="auth_username_summary" msgid="941160241371436473">"Brukernavn som brukes til autentisering"</string>
<string name="default_preference_summary" msgid="1979249643719483249">"<Ikke angitt>"</string>
<string name="display_name_summary" msgid="7155076491675565407">"<Samme som brukernavn>"</string>
<string name="optional_summary" msgid="2363105560396317624">"<Valgfritt>"</string>
@@ -68,10 +68,10 @@
<string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Trykk for å skjule alle"</string>
<string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> er obligatorisk. Feltet kan ikke være tomt."</string>
<string name="not_a_valid_port" msgid="7931422555587011830">"Portnummeret må være mellom 1000 og 65534."</string>
- <string name="no_internet_available" msgid="5523747991760017298">"For å foreta en SIP-oppringing må du først sjekke internettilkoblingen din."</string>
- <string name="no_wifi_available" msgid="1955023904229673488">"Du må være koblet til et Wi-Fi-nettverk for å benytte SIP-oppringing (bruk Trådløst og nettverk-innstillingene)."</string>
- <string name="no_voip" msgid="3038021971231952704">"SIP-oppringing støttes ikke"</string>
+ <string name="no_internet_available" msgid="5523747991760017298">"For å bruke SIP-anrop må du først sjekke internettilkoblingen din."</string>
+ <string name="no_wifi_available" msgid="1955023904229673488">"Du må være koblet til et Wi-Fi-nettverk for å benytte SIP-anrop (bruk Trådløst og nettverk-innstillingene)."</string>
+ <string name="no_voip" msgid="3038021971231952704">"SIP-anrop støttes ikke"</string>
<string name="sip_system_decide" msgid="5577696249416700671">"Automatisk"</string>
<string name="sip_always_send_keepalive" msgid="4773022409239823318">"Send alltid"</string>
- <string name="sip_connection_service_label" msgid="6935325004265884453">"Innebygd SIP-oppringing"</string>
+ <string name="sip_connection_service_label" msgid="6935325004265884453">"Innebygd SIP-anrop"</string>
</resources>
diff --git a/sip/res/values-pl/strings.xml b/sip/res/values-pl/strings.xml
index b8b94f7..d00c723 100644
--- a/sip/res/values-pl/strings.xml
+++ b/sip/res/values-pl/strings.xml
@@ -19,7 +19,7 @@
<string name="sip_settings" msgid="3768482698061677257">"Ustawienia SIP"</string>
<string name="sip_accounts" msgid="85559497282185405">"Konta SIP"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"Konta"</string>
- <string name="sip_receive_calls" msgid="426678617137462173">"Odbieraj połączenia przychodzące"</string>
+ <string name="sip_receive_calls" msgid="426678617137462173">"Odbieraj przychodzące"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Zużywa więcej energii baterii"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"Użyj połączenia SIP"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Użyj połączenia SIP (tylko przez Wi-Fi)"</string>
diff --git a/sip/res/values-sk/strings.xml b/sip/res/values-sk/strings.xml
index f55227d..1800b88 100644
--- a/sip/res/values-sk/strings.xml
+++ b/sip/res/values-sk/strings.xml
@@ -20,9 +20,9 @@
<string name="sip_accounts" msgid="85559497282185405">"Účty SIP"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"Účty"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Prijímať prichádzajúce hovory"</string>
- <string name="sip_receive_calls_summary" msgid="946161517528227523">"Má väčšiu spotrebu batérie"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Používanie hovorov SIP"</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Používanie hovorov SIP (iba sieť Wi-Fi)"</string>
+ <string name="sip_receive_calls_summary" msgid="946161517528227523">"Viac vybíja batériu"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Používanie volania SIP"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Používanie volania SIP (iba Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Pre všetky hovory, pokiaľ je k dispozícii dátová sieť"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"Iba pre hovory SIP"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Pre všetky hovory"</string>
@@ -32,7 +32,7 @@
<string name="saving_account" msgid="5336529880235177448">"Prebieha ukladanie účtu..."</string>
<string name="removing_account" msgid="5537351356808985756">"Prebieha odstraňovanie účtu..."</string>
<string name="sip_menu_save" msgid="7882219814563869225">"Uložiť"</string>
- <string name="sip_menu_discard" msgid="2350421645423888438">"Zrušiť"</string>
+ <string name="sip_menu_discard" msgid="2350421645423888438">"Zahodiť"</string>
<string name="alert_dialog_close" msgid="1326011828713435134">"Zavrieť profil"</string>
<string name="alert_dialog_ok" msgid="4752048404605388940">"OK"</string>
<string name="close_profile" msgid="3122414058856309881">"Zavrieť"</string>
@@ -48,16 +48,16 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Registrácia účtu nebola úspešná: nesprávne používateľské meno alebo heslo."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"Registrácia účtu nebola úspešná: skontrolujte názov servera."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"Tento účet momentálne používa aplikácia používateľa <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"Podrobnosti o účtu SIP"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"Podrobnosti o účtu SIP"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"Účet SIP"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"Účet SIP"</string>
<string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
- <string name="username_title" msgid="6770064611005663470">"Meno používateľa"</string>
+ <string name="username_title" msgid="6770064611005663470">"Používateľské meno"</string>
<string name="password_title" msgid="5289013731515564295">"Heslo"</string>
<string name="display_name_title" msgid="579241787583079773">"Zobrazované meno"</string>
- <string name="proxy_address_title" msgid="6890163365640631841">"Adresa výstupného servera proxy"</string>
+ <string name="proxy_address_title" msgid="6890163365640631841">"Adresa výstupného proxy servera"</string>
<string name="port_title" msgid="6693965912656593862">"Číslo portu"</string>
<string name="transport_title" msgid="889155457465372527">"Typ prenosu"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Odosielať správy na zachovanie pripojenia"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Správy na zachovanie pripojenia"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Voliteľné nastavenia"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Používateľské meno na overenie"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Používateľské meno použité na overenie"</string>
diff --git a/sip/res/values-sl/strings.xml b/sip/res/values-sl/strings.xml
index 1768705..55f556b 100644
--- a/sip/res/values-sl/strings.xml
+++ b/sip/res/values-sl/strings.xml
@@ -56,7 +56,7 @@
<string name="display_name_title" msgid="579241787583079773">"Prikazno ime"</string>
<string name="proxy_address_title" msgid="6890163365640631841">"Naslov strežnika proxy za odhodne klice"</string>
<string name="port_title" msgid="6693965912656593862">"Številka vrat"</string>
- <string name="transport_title" msgid="889155457465372527">"Vrsta prevoza"</string>
+ <string name="transport_title" msgid="889155457465372527">"Vrsta transporta"</string>
<string name="send_keepalive_title" msgid="599627072150501159">"Pošlji ohranjanje povezave"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Izbirne nastavitve"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Uporabniško ime za preverjanje pristnosti"</string>
diff --git a/sip/res/values-sq-rAL/strings.xml b/sip/res/values-sq-rAL/strings.xml
index f64c270..f7c794f 100644
--- a/sip/res/values-sq-rAL/strings.xml
+++ b/sip/res/values-sq-rAL/strings.xml
@@ -21,10 +21,10 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"Llogaritë"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Merr telefonata hyrëse"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Pakëson jetëgjatësinë e baterisë"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Përdor \"telefonatat SIP\""</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Përdor \"telefonatat SIP\" (vetëm Wi-Fi)"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Përdor telefonatat me SIP"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Përdor telefonatat me SIP (vetëm Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Për të gjitha telefonat kur rrjeti i të dhënave mund të përdoret"</string>
- <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Vetëm për telefonatat SIP"</string>
+ <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Vetëm për telefonatat me SIP"</string>
<string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Për të gjitha telefonatat"</string>
<string name="add_sip_account" msgid="800843669753980091">"Shto llogari"</string>
<string name="remove_sip_account" msgid="1367664438506503690">"Hiq llogarinë"</string>
@@ -32,9 +32,9 @@
<string name="saving_account" msgid="5336529880235177448">"Po ruan llogarinë…"</string>
<string name="removing_account" msgid="5537351356808985756">"Po heq llogarinë…"</string>
<string name="sip_menu_save" msgid="7882219814563869225">"Ruaj"</string>
- <string name="sip_menu_discard" msgid="2350421645423888438">"Hidh poshtë"</string>
+ <string name="sip_menu_discard" msgid="2350421645423888438">"Injoro"</string>
<string name="alert_dialog_close" msgid="1326011828713435134">"Mbyll profilin"</string>
- <string name="alert_dialog_ok" msgid="4752048404605388940">"Në rregull!"</string>
+ <string name="alert_dialog_ok" msgid="4752048404605388940">"Në rregull"</string>
<string name="close_profile" msgid="3122414058856309881">"Mbyll"</string>
<string name="registration_status_checking_status" msgid="6136793741862200337">"Po kontrollon statusin..."</string>
<string name="registration_status_registering" msgid="2677183977796278749">"Po regjistron..."</string>
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Regjistrimi i llogarisë ishte i pasuksesshëm: emri i përdoruesit ose fjalëkalimi ishte i pasaktë."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"Regjistrimi i llogarisë ishte i pasuksesshëm. Kontrollo emrin e serverit."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"Kjo llogari është aktualisht në përdorim nga aplikacioni <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"Detajet e llogarisë SIP"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"Detajet e llogarisë SIP"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"SIP"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"SIP"</string>
<string name="domain_address_title" msgid="1968479941328225423">"Serveri"</string>
<string name="username_title" msgid="6770064611005663470">"Emri i përdoruesit"</string>
<string name="password_title" msgid="5289013731515564295">"Fjalëkalimi"</string>
@@ -57,7 +57,7 @@
<string name="proxy_address_title" msgid="6890163365640631841">"Adresa e përfaqësuesit dalës"</string>
<string name="port_title" msgid="6693965912656593862">"Numri i portës"</string>
<string name="transport_title" msgid="889155457465372527">"Lloji i transportit"</string>
- <string name="send_keepalive_title" msgid="599627072150501159">"Dërgo preferencën e kontrollit të operimit"</string>
+ <string name="send_keepalive_title" msgid="599627072150501159">"Kontrolli i veprimtarisë"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Cilësimet opsionale"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Emri i përdoruesit për vërtetim"</string>
<string name="auth_username_summary" msgid="941160241371436473">"Emri i përdoruesit i përdorur për vërtetim"</string>
diff --git a/sip/res/values-ta-rIN/strings.xml b/sip/res/values-ta-rIN/strings.xml
index c4c2982..130fbb6 100644
--- a/sip/res/values-ta-rIN/strings.xml
+++ b/sip/res/values-ta-rIN/strings.xml
@@ -60,7 +60,7 @@
<string name="send_keepalive_title" msgid="599627072150501159">"எப்போதும் விழிப்புடன் அனுப்பு"</string>
<string name="advanced_settings" msgid="6622996380747040711">"விருப்ப அமைப்பு"</string>
<string name="auth_username_title" msgid="8262491689004708265">"அங்கீகாரப் பயனர்பெயர்"</string>
- <string name="auth_username_summary" msgid="941160241371436473">"அங்கீகரிப்பிற்குப் பயனர்பெயர் பயன்படுத்தப்பட்டது"</string>
+ <string name="auth_username_summary" msgid="941160241371436473">"அங்கீகரிப்பிற்குப் பயன்படுத்தப்படும் பயனர்பெயர்"</string>
<string name="default_preference_summary" msgid="1979249643719483249">"<அமைக்கப்படவில்லை>"</string>
<string name="display_name_summary" msgid="7155076491675565407">"<பயனர்பெயர் போன்றது>"</string>
<string name="optional_summary" msgid="2363105560396317624">"<விரும்பினால்>"</string>
diff --git a/sip/res/values-tl/strings.xml b/sip/res/values-tl/strings.xml
index bcc2ae5..f6b608a 100644
--- a/sip/res/values-tl/strings.xml
+++ b/sip/res/values-tl/strings.xml
@@ -20,7 +20,7 @@
<string name="sip_accounts" msgid="85559497282185405">"Mga SIP account"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"Mga Account"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Tumanggap ng mga papasok na tawag"</string>
- <string name="sip_receive_calls_summary" msgid="946161517528227523">"Gumagamit ng higit na tagal ng baterya"</string>
+ <string name="sip_receive_calls_summary" msgid="946161517528227523">"Gumagamit ng higit na baterya"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"Gamitin ang pagtawag sa pamamagitan ng SIP"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Gamitin ang pagtawag sa pamamagitan ng SIP (Wi-Fi lang)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Para sa lahat ng mga tawag kapag available ang data network"</string>
@@ -59,13 +59,13 @@
<string name="transport_title" msgid="889155457465372527">"Uri ng paglilipat"</string>
<string name="send_keepalive_title" msgid="599627072150501159">"Magpadala ng keep-alive"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Mga opsyonal na setting"</string>
- <string name="auth_username_title" msgid="8262491689004708265">"Username sa pagpapatotoo"</string>
- <string name="auth_username_summary" msgid="941160241371436473">"Ginamit ang username para sa pagpapatotoo"</string>
+ <string name="auth_username_title" msgid="8262491689004708265">"Username sa pagpapatunay"</string>
+ <string name="auth_username_summary" msgid="941160241371436473">"Ginamit ang username para sa pagpapatunay"</string>
<string name="default_preference_summary" msgid="1979249643719483249">"<Hindi nakatakda>"</string>
<string name="display_name_summary" msgid="7155076491675565407">"<Katulad ng username>"</string>
<string name="optional_summary" msgid="2363105560396317624">"<Opsyonal>"</string>
<string name="advanced_settings_show" msgid="7838761602853998622">"▷ Pindutin upang ipakita lahat"</string>
- <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Pindutin upang itago ang lahat"</string>
+ <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ Pindutin upang itago lahat"</string>
<string name="empty_alert" msgid="6659484914371384024">"Kinakailangan ang <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> at hindi maaaring iwanang blangko."</string>
<string name="not_a_valid_port" msgid="7931422555587011830">"Dapat na nasa pagitan ng 1000 at 65534 ang numero ng port."</string>
<string name="no_internet_available" msgid="5523747991760017298">"Upang tumawag sa pamamagitan ng SIP, suriin muna ang iyong koneksyon sa Internet."</string>
diff --git a/sip/res/values-uk/strings.xml b/sip/res/values-uk/strings.xml
index f577451..e295cb0 100644
--- a/sip/res/values-uk/strings.xml
+++ b/sip/res/values-uk/strings.xml
@@ -21,12 +21,12 @@
<string name="sip_accounts_title" msgid="2082527045326874519">"Облікові записи"</string>
<string name="sip_receive_calls" msgid="426678617137462173">"Отримувати вхідні дзвінки"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Використовує більше заряду акумулятора"</string>
- <string name="sip_call_options_title" msgid="8421210494703869806">"Використання викликів SIP"</string>
- <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Використання викликів SIP (лише Wi-Fi)"</string>
+ <string name="sip_call_options_title" msgid="8421210494703869806">"Виклик через SIP"</string>
+ <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Виклики через SIP (лише Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Для всіх дзвінків, коли доступна мережа передавання даних"</string>
<string name="sip_call_options_entry_2" msgid="1815335903940609729">"Лише для викликів SIP"</string>
- <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Для всіх дзвінків"</string>
- <string name="add_sip_account" msgid="800843669753980091">"Додати обліковий запис"</string>
+ <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Для всіх викликів"</string>
+ <string name="add_sip_account" msgid="800843669753980091">"Додати обл. запис"</string>
<string name="remove_sip_account" msgid="1367664438506503690">"Видалити обліковий запис"</string>
<string name="sip_account_list" msgid="5610858485304821480">"Облікові записи SIP"</string>
<string name="saving_account" msgid="5336529880235177448">"Зберігання облікового запису…"</string>
@@ -48,8 +48,8 @@
<string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Обліковий запис не зареєстровано: неправильне ім’я користувача чи пароль."</string>
<string name="registration_status_server_unreachable" msgid="7710275557045148634">"Обліковий запис не зареєстровано: перевірте ім’я сервера."</string>
<string name="third_party_account_summary" msgid="9041060473615403041">"Зараз цей обліковий запис використовується додатком <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
- <string name="sip_edit_title" msgid="1967247832635750410">"Дані облікового запису SIP"</string>
- <string name="sip_edit_new_title" msgid="266414118302574305">"Дані облікового запису SIP"</string>
+ <string name="sip_edit_title" msgid="1967247832635750410">"Обл. запис SIP"</string>
+ <string name="sip_edit_new_title" msgid="266414118302574305">"Обл. запис SIP"</string>
<string name="domain_address_title" msgid="1968479941328225423">"Сервер"</string>
<string name="username_title" msgid="6770064611005663470">"Ім’я користувача"</string>
<string name="password_title" msgid="5289013731515564295">"Пароль"</string>
diff --git a/sip/res/values-uz-rUZ/strings.xml b/sip/res/values-uz-rUZ/strings.xml
index 2246575..94c6cef 100644
--- a/sip/res/values-uz-rUZ/strings.xml
+++ b/sip/res/values-uz-rUZ/strings.xml
@@ -19,7 +19,7 @@
<string name="sip_settings" msgid="3768482698061677257">"SIP sozlamalari"</string>
<string name="sip_accounts" msgid="85559497282185405">"SIP hisoblari"</string>
<string name="sip_accounts_title" msgid="2082527045326874519">"Hisoblar"</string>
- <string name="sip_receive_calls" msgid="426678617137462173">"Kiruvchi qo‘n-ni qabul qilish"</string>
+ <string name="sip_receive_calls" msgid="426678617137462173">"Kiruvchilarni qabul qilish"</string>
<string name="sip_receive_calls_summary" msgid="946161517528227523">"Batareya quvvatini ko‘p sarflaydi"</string>
<string name="sip_call_options_title" msgid="8421210494703869806">"SIP-qo‘ng‘iroq"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP-qo‘ng‘iroq (faqat Wi-Fi)"</string>
diff --git a/sip/res/values-vi/strings.xml b/sip/res/values-vi/strings.xml
index 04a1908..c72eb03 100644
--- a/sip/res/values-vi/strings.xml
+++ b/sip/res/values-vi/strings.xml
@@ -24,8 +24,8 @@
<string name="sip_call_options_title" msgid="8421210494703869806">"Sử dụng tính năng gọi điện SIP"</string>
<string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Sử dụng tính năng gọi điện SIP (chỉ Wi-Fi)"</string>
<string name="sip_call_options_entry_1" msgid="7217659161237099900">"Dành cho tất cả các cuộc gọi khi mạng dữ liệu sẵn có"</string>
- <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Chỉ dành cho cuộc gọi SIP"</string>
- <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Dành cho tất cả các cuộc gọi"</string>
+ <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Chỉ cho cuộc gọi SIP"</string>
+ <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Cho tất cả cuộc gọi"</string>
<string name="add_sip_account" msgid="800843669753980091">"Thêm tài khoản"</string>
<string name="remove_sip_account" msgid="1367664438506503690">"Xóa tài khoản"</string>
<string name="sip_account_list" msgid="5610858485304821480">"Tài khoản SIP"</string>
@@ -60,8 +60,8 @@
<string name="send_keepalive_title" msgid="599627072150501159">"Gửi giữ kết nối"</string>
<string name="advanced_settings" msgid="6622996380747040711">"Cài đặt tùy chọn"</string>
<string name="auth_username_title" msgid="8262491689004708265">"Tên người dùng xác thực"</string>
- <string name="auth_username_summary" msgid="941160241371436473">"Tên người dùng được sử dụng để xác thực"</string>
- <string name="default_preference_summary" msgid="1979249643719483249">"<Chưa được đặt>"</string>
+ <string name="auth_username_summary" msgid="941160241371436473">"Tên người dùng để xác thực"</string>
+ <string name="default_preference_summary" msgid="1979249643719483249">"<Chưa đặt>"</string>
<string name="display_name_summary" msgid="7155076491675565407">"<Giống như tên người dùng>"</string>
<string name="optional_summary" msgid="2363105560396317624">"<Tùy chọn>"</string>
<string name="advanced_settings_show" msgid="7838761602853998622">"▷ Chạm để hiển thị tất cả"</string>
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 6a4034e..00c9170 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -52,6 +52,7 @@
import com.android.internal.telephony.PhoneConstants;
import com.android.phone.common.util.SettingsUtil;
import com.android.phone.settings.AccountSelectionPreference;
+import com.android.phone.settings.PhoneAccountSettingsFragment;
import com.android.phone.settings.VoicemailSettingsActivity;
import com.android.phone.settings.fdn.FdnSetting;
import com.android.services.telephony.sip.SipUtil;
@@ -200,8 +201,7 @@
(TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
Preference phoneAccountSettingsPreference = findPreference(PHONE_ACCOUNT_SETTINGS_KEY);
- if (telephonyManager.isMultiSimEnabled() || (mTelecomManager.getSimCallManagers().isEmpty()
- && !SipUtil.isVoipSupported(mPhone.getContext()))) {
+ if (telephonyManager.isMultiSimEnabled() || !SipUtil.isVoipSupported(mPhone.getContext())) {
getPreferenceScreen().removePreference(phoneAccountSettingsPreference);
}
@@ -275,8 +275,8 @@
}
if (ImsManager.isVolteEnabledByPlatform(this) &&
- !mPhone.getContext().getResources().getBoolean(
- com.android.internal.R.bool.config_carrier_volte_tty_supported)) {
+ !carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL)) {
TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
/* tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE); */
}
@@ -285,20 +285,10 @@
getResources().getString(R.string.wifi_calling_settings_key));
final PhoneAccountHandle simCallManager = mTelecomManager.getSimCallManager();
- String simCallManagerPackage = simCallManager != null
- && simCallManager.getComponentName() != null
- ? simCallManager.getComponentName().getPackageName()
- : null;
-
- if (!TextUtils.isEmpty(simCallManagerPackage)) {
- final Intent intent = new Intent(TelecomManager.ACTION_CONNECTION_SERVICE_CONFIGURE)
- .addCategory(Intent.CATEGORY_DEFAULT)
- .setPackage(simCallManagerPackage);
-
- // Check whether the configuration intent is supported.
- PackageManager pm = getPackageManager();
- List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
- if (resolutions.size() > 0) {
+ if (simCallManager != null) {
+ Intent intent = PhoneAccountSettingsFragment.buildPhoneAccountConfigureIntent(
+ this, simCallManager);
+ if (intent != null) {
wifiCallingSettings.setTitle(R.string.wifi_calling);
wifiCallingSettings.setSummary(null);
wifiCallingSettings.setIntent(intent);
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 544b7b2..e0834c7 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -17,7 +17,6 @@
package com.android.phone;
import static android.Manifest.permission.READ_PHONE_STATE;
-import static com.android.internal.telephony.uicc.IccCardProxy.ACTION_INTERNAL_SIM_STATE_CHANGED;
import android.annotation.NonNull;
import android.app.ActivityManagerNative;
@@ -27,12 +26,14 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
+import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.os.AsyncResult;
import android.os.Binder;
+import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
@@ -40,6 +41,7 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.UserHandle;
+import android.preference.PreferenceManager;
import android.service.carrier.CarrierIdentifier;
import android.service.carrier.CarrierService;
import android.service.carrier.ICarrierService;
@@ -72,7 +74,6 @@
/**
* CarrierConfigLoader binds to privileged carrier apps to fetch carrier config overlays.
- * TODO: handle package install/uninstall events
*/
public class CarrierConfigLoader extends ICarrierConfigLoader.Stub {
@@ -115,6 +116,8 @@
private static final int EVENT_BIND_DEFAULT_TIMEOUT = 10;
// Bind timed out for a carrier app.
private static final int EVENT_BIND_CARRIER_TIMEOUT = 11;
+ // Check if the system fingerprint has changed.
+ private static final int EVENT_CHECK_SYSTEM_UPDATE = 12;
private static final int BIND_TIMEOUT_MILLIS = 10000;
@@ -123,6 +126,9 @@
private static final String TAG_VERSION = "package_version";
private static final String TAG_BUNDLE = "bundle_data";
+ // SharedPreferences key for last known build fingerprint.
+ private static final String KEY_FINGERPRINT = "build_fingerprint";
+
// Handler to process various events.
//
// For each phoneId, the event sequence should be:
@@ -163,10 +169,13 @@
case EVENT_PACKAGE_CHANGED:
carrierPackageName = (String) msg.obj;
- deleteConfigForPackage(carrierPackageName);
- int numPhones = TelephonyManager.from(mContext).getPhoneCount();
- for (int i = 0; i < numPhones; ++i) {
- updateConfigForPhoneId(i);
+ // Only update if there are cached config removed to avoid updating config
+ // for unrelated packages.
+ if (clearCachedConfigForPackage(carrierPackageName)) {
+ int numPhones = TelephonyManager.from(mContext).getPhoneCount();
+ for (int i = 0; i < numPhones; ++i) {
+ updateConfigForPhoneId(i);
+ }
}
break;
@@ -300,6 +309,18 @@
}
broadcastConfigChangedIntent(phoneId);
break;
+
+ case EVENT_CHECK_SYSTEM_UPDATE:
+ SharedPreferences sharedPrefs =
+ PreferenceManager.getDefaultSharedPreferences(mContext);
+ final String lastFingerprint = sharedPrefs.getString(KEY_FINGERPRINT, null);
+ if (!Build.FINGERPRINT.equals(lastFingerprint)) {
+ log("Build fingerprint changed. old: "
+ + lastFingerprint + " new: " + Build.FINGERPRINT);
+ clearCachedConfigForPackage(null);
+ sharedPrefs.edit().putString(KEY_FINGERPRINT, Build.FINGERPRINT).apply();
+ }
+ break;
}
}
};
@@ -311,12 +332,14 @@
private CarrierConfigLoader(Context context) {
mContext = context;
- // Register for package updates.
- IntentFilter triggers = new IntentFilter();
- triggers.addAction(Intent.ACTION_PACKAGE_ADDED);
- triggers.addAction(Intent.ACTION_PACKAGE_CHANGED);
- triggers.addAction(Intent.ACTION_PACKAGE_REMOVED);
- mContext.registerReceiver(mReceiver, triggers);
+ // Register for package updates. Update app or uninstall app update will have all 3 intents,
+ // in the order or removed, added, replaced, all with extra_replace set to true.
+ IntentFilter pkgFilter = new IntentFilter();
+ pkgFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+ pkgFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+ pkgFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+ pkgFilter.addDataScheme("package");
+ context.registerReceiverAsUser(mReceiver, UserHandle.ALL, pkgFilter, null, null);
int numPhones = TelephonyManager.from(context).getPhoneCount();
mConfigFromDefaultApp = new PersistableBundle[numPhones];
@@ -325,6 +348,7 @@
// Make this service available through ServiceManager.
ServiceManager.addService(Context.CARRIER_CONFIG_SERVICE, this);
log("CarrierConfigLoader has started");
+ mHandler.sendEmptyMessage(EVENT_CHECK_SYSTEM_UPDATE);
}
/**
@@ -355,7 +379,7 @@
/** Binds to the default or carrier config app. */
private boolean bindToConfigPackage(String pkgName, int phoneId, int eventId) {
log("Binding to " + pkgName + " for phone " + phoneId);
- Intent carrierService = new Intent(CarrierService.CONFIG_SERVICE_INTERFACE);
+ Intent carrierService = new Intent(CarrierService.CARRIER_SERVICE_INTERFACE);
carrierService.setPackage(pkgName);
mServiceConnection[phoneId] = new CarrierServiceConnection(phoneId, eventId);
try {
@@ -393,7 +417,7 @@
private String getCarrierPackageForPhoneId(int phoneId) {
List<String> carrierPackageNames = TelephonyManager.from(mContext)
.getCarrierPackageNamesForIntentAndPhone(
- new Intent(CarrierService.CONFIG_SERVICE_INTERFACE), phoneId);
+ new Intent(CarrierService.CARRIER_SERVICE_INTERFACE), phoneId);
if (carrierPackageNames != null && carrierPackageNames.size() > 0) {
return carrierPackageNames.get(0);
} else {
@@ -530,18 +554,32 @@
return restoredBundle;
}
- /** Deletes all saved XML files associated with the given package name. */
- private void deleteConfigForPackage(final String packageName) {
+ /**
+ * Clears cached carrier config.
+ * This deletes all saved XML files associated with the given package name. If packageName is
+ * null, then it deletes all saved XML files.
+ *
+ * @param packageName the name of a carrier package, or null if all cached config should be
+ * cleared.
+ * @return true iff one or more files were deleted.
+ */
+ private boolean clearCachedConfigForPackage(final String packageName) {
File dir = mContext.getFilesDir();
File[] packageFiles = dir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String filename) {
- return filename.startsWith("carrierconfig-" + packageName + "-");
+ if (packageName != null) {
+ return filename.startsWith("carrierconfig-" + packageName + "-");
+ } else {
+ return filename.startsWith("carrierconfig-");
+ }
}
});
+ if (packageFiles == null || packageFiles.length < 1) return false;
for (File f : packageFiles) {
log("deleting " + f.getName());
f.delete();
}
+ return true;
}
/** Builds a canonical file name for a config file. */
@@ -566,12 +604,19 @@
* have a saved config file to use instead.
*/
private void updateConfigForPhoneId(int phoneId) {
+ // Clear in-memory cache for carrier app config, so when carrier app gets uninstalled, no
+ // stale config is left.
+ if (mConfigFromCarrierApp[phoneId] != null &&
+ getCarrierPackageForPhoneId(phoneId) == null) {
+ mConfigFromCarrierApp[phoneId] = null;
+ }
mHandler.sendMessage(mHandler.obtainMessage(EVENT_FETCH_DEFAULT, phoneId, -1));
}
@Override public
@NonNull
PersistableBundle getConfigForSubId(int subId) {
+ mContext.enforceCallingOrSelfPermission(READ_PHONE_STATE, null);
int phoneId = SubscriptionManager.getPhoneId(subId);
PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();
if (SubscriptionManager.isValidPhoneId(phoneId)) {
@@ -605,12 +650,14 @@
// This method should block until deleting has completed, so that an error which prevents us
// from clearing the cache is passed back to the carrier app. With the files successfully
// deleted, this can return and we will eventually bind to the carrier app.
- deleteConfigForPackage(callingPackageName);
+ clearCachedConfigForPackage(callingPackageName);
updateConfigForPhoneId(phoneId);
}
@Override
public void updateConfigForPhoneId(int phoneId, String simState) {
+ mContext.enforceCallingOrSelfPermission(
+ android.Manifest.permission.MODIFY_PHONE_STATE, null);
log("update config for phoneId: " + phoneId + " simState: " + simState);
if (!SubscriptionManager.isValidPhoneId(phoneId)) {
return;
@@ -672,18 +719,23 @@
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
- log("Receive action: " + action);
+ boolean replace = intent.getBooleanExtra(Intent.EXTRA_REPLACING, false);
+ // If replace is true, only care ACTION_PACKAGE_REPLACED.
+ if (replace && !Intent.ACTION_PACKAGE_REPLACED.equals(action))
+ return;
+
switch (action) {
case Intent.ACTION_PACKAGE_ADDED:
- case Intent.ACTION_PACKAGE_CHANGED:
case Intent.ACTION_PACKAGE_REMOVED:
+ case Intent.ACTION_PACKAGE_REPLACED:
int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);
String packageName = mContext.getPackageManager().getNameForUid(uid);
- // We don't have a phoneId for arg1.
- mHandler.sendMessage(
- mHandler.obtainMessage(EVENT_PACKAGE_CHANGED, packageName));
+ if (packageName != null) {
+ // We don't have a phoneId for arg1.
+ mHandler.sendMessage(
+ mHandler.obtainMessage(EVENT_PACKAGE_CHANGED, packageName));
+ }
break;
-
}
}
}
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 71557c6..780f76b 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -34,6 +34,7 @@
import android.telecom.PhoneAccount;
import android.telephony.CarrierConfigManager;
import android.telephony.PhoneNumberUtils;
+import android.telephony.SubscriptionManager;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -200,7 +201,12 @@
mDialButton = findViewById(R.id.floating_action_button);
// Check whether we should show the onscreen "Dial" button and co.
- PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
+ // Read carrier config through the public API because PhoneGlobals is not available when we
+ // run as a secondary user.
+ CarrierConfigManager configMgr =
+ (CarrierConfigManager) getSystemService(Context.CARRIER_CONFIG_SERVICE);
+ PersistableBundle carrierConfig =
+ configMgr.getConfigForSubId(SubscriptionManager.getDefaultVoiceSubId());
if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL)) {
mDialButton.setOnClickListener(this);
} else {
diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index df5f2cd..d12bac9 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -85,7 +85,7 @@
.findPreference(BUTTON_OPERATOR_SELECTION_EXPAND_KEY));
}
- if (res.getBoolean(R.bool.csp_enabled)) {
+ if (carrierConfig.getBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL)) {
if (PhoneFactory.getDefaultPhone().isCspPlmnEnabled()) {
log("[CSP] Enabling Operator Selection menu.");
mButtonOperatorSelectionExpand.setEnabled(true);
diff --git a/src/com/android/phone/IccNetworkDepersonalizationPanel.java b/src/com/android/phone/IccNetworkDepersonalizationPanel.java
index 34153c8..4831423 100644
--- a/src/com/android/phone/IccNetworkDepersonalizationPanel.java
+++ b/src/com/android/phone/IccNetworkDepersonalizationPanel.java
@@ -135,7 +135,7 @@
mUnlockButton.setOnClickListener(mUnlockListener);
// The "Dismiss" button is present in some (but not all) products,
- // based on the "sim_network_unlock_allow_dismiss" resource.
+ // based on the "KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL" variable.
mDismissButton = (Button) findViewById(R.id.ndp_dismiss);
PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
if (carrierConfig.getBoolean(
diff --git a/src/com/android/phone/InCallScreenShowActivation.java b/src/com/android/phone/InCallScreenShowActivation.java
index b3df183..9d35442 100644
--- a/src/com/android/phone/InCallScreenShowActivation.java
+++ b/src/com/android/phone/InCallScreenShowActivation.java
@@ -62,7 +62,25 @@
Log.d(LOG_TAG, " - extras = " + extras);
}
- PhoneGlobals app = PhoneGlobals.getInstance();
+ PhoneGlobals app = PhoneGlobals.getInstanceIfPrimary();
+ if (app == null) {
+ // TODO: All CDMA provisioning code should move into a BroadcastReceiver that runs
+ // exclusively in the primary user's context. This is because the majority of the
+ // telephony logic -- and all of the important bits -- runs only as primary so we don't
+ // have access to the things we need. We still need to maintain an Activity to support
+ // legacy code which starts this using startActivity() but that Activity should be a
+ // simple intent-trampoline for the new BroadcastReceiver.
+ //
+ // Though this conditional protects this code from NPEs on a secondary user due to an
+ // uninitialized PhoneGlobals, there's not a good reason at the time of this writing as
+ // to why a secondary user context shouldn't trigger a CDMA provisioning, or at least
+ // nobody has expressed concern.
+ Log.i(LOG_TAG, "Being asked to provision CDMA SIM from secondary user, skipping.");
+ setResult(RESULT_CANCELED);
+ finish();
+ return;
+ }
+
Phone phone = app.getPhone();
if (!TelephonyCapabilities.supportsOtasp(phone)) {
Log.w(LOG_TAG, "CDMA Provisioning not supported on this device");
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 96d00ae..bcb627e 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -470,6 +470,12 @@
}
@Override
+ protected void onDestroy() {
+ super.onDestroy();
+ unregisterReceiver(mPhoneChangeReceiver);
+ }
+
+ @Override
protected void onResume() {
super.onResume();
if (DBG) log("onResume:+");
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index eb9ea15..4fca2ea 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -513,11 +513,11 @@
return mCM;
}
- /* package */ PersistableBundle getCarrierConfig() {
+ public PersistableBundle getCarrierConfig() {
return getCarrierConfigForSubId(SubscriptionManager.getDefaultSubId());
}
- /* package */ PersistableBundle getCarrierConfigForSubId(int subId) {
+ public PersistableBundle getCarrierConfigForSubId(int subId) {
return configLoader.getConfigForSubId(subId);
}
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 25e25be..8273e1e 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -57,11 +57,13 @@
import com.android.ims.ImsManager;
import com.android.internal.telephony.CallManager;
+import com.android.internal.telephony.CellNetworkScanResult;
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.DefaultPhoneNotifier;
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.IccCard;
import com.android.internal.telephony.MccTable;
+import com.android.internal.telephony.OperatorInfo;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.ProxyController;
@@ -132,7 +134,10 @@
private static final int EVENT_SET_NETWORK_SELECTION_MODE_AUTOMATIC_DONE = 36;
private static final int CMD_GET_MODEM_ACTIVITY_INFO = 37;
private static final int EVENT_GET_MODEM_ACTIVITY_INFO_DONE = 38;
-
+ private static final int CMD_PERFORM_NETWORK_SCAN = 39;
+ private static final int EVENT_PERFORM_NETWORK_SCAN_DONE = 40;
+ private static final int CMD_SET_NETWORK_SELECTION_MODE_MANUAL = 41;
+ private static final int EVENT_SET_NETWORK_SELECTION_MODE_MANUAL_DONE = 42;
/** The singleton instance. */
private static PhoneInterfaceManager sInstance;
@@ -227,15 +232,18 @@
IccAPDUArgument iccArgument;
switch (msg.what) {
- case CMD_HANDLE_PIN_MMI:
+ case CMD_HANDLE_PIN_MMI: {
request = (MainThreadRequest) msg.obj;
- request.result = getPhoneFromRequest(request).handlePinMmi(
- (String) request.argument);
+ final Phone phone = getPhoneFromRequest(request);
+ request.result = phone != null ?
+ getPhoneFromRequest(request).handlePinMmi((String) request.argument)
+ : false;
// Wake up the requesting thread
synchronized (request) {
request.notifyAll();
}
break;
+ }
case CMD_HANDLE_NEIGHBORING_CELL:
request = (MainThreadRequest) msg.obj;
@@ -647,6 +655,57 @@
handleNullReturnEvent(msg, "setNetworkSelectionModeAutomatic");
break;
+ case CMD_PERFORM_NETWORK_SCAN:
+ request = (MainThreadRequest) msg.obj;
+ onCompleted = obtainMessage(EVENT_PERFORM_NETWORK_SCAN_DONE, request);
+ getPhoneFromRequest(request).getAvailableNetworks(onCompleted);
+ break;
+
+ case EVENT_PERFORM_NETWORK_SCAN_DONE:
+ ar = (AsyncResult) msg.obj;
+ request = (MainThreadRequest) ar.userObj;
+ CellNetworkScanResult cellScanResult;
+ if (ar.exception == null && ar.result != null) {
+ cellScanResult = new CellNetworkScanResult(
+ CellNetworkScanResult.STATUS_SUCCESS,
+ (List<OperatorInfo>) ar.result);
+ } else {
+ if (ar.result == null) {
+ loge("getCellNetworkScanResults: Empty response");
+ }
+ if (ar.exception != null) {
+ loge("getCellNetworkScanResults: Exception: " + ar.exception);
+ }
+ int errorCode = CellNetworkScanResult.STATUS_UNKNOWN_ERROR;
+ if (ar.exception instanceof CommandException) {
+ CommandException.Error error =
+ ((CommandException) (ar.exception)).getCommandError();
+ if (error == CommandException.Error.RADIO_NOT_AVAILABLE) {
+ errorCode = CellNetworkScanResult.STATUS_RADIO_NOT_AVAILABLE;
+ } else if (error == CommandException.Error.GENERIC_FAILURE) {
+ errorCode = CellNetworkScanResult.STATUS_RADIO_GENERIC_FAILURE;
+ }
+ }
+ cellScanResult = new CellNetworkScanResult(errorCode, null);
+ }
+ request.result = cellScanResult;
+ synchronized (request) {
+ request.notifyAll();
+ }
+ break;
+
+ case CMD_SET_NETWORK_SELECTION_MODE_MANUAL:
+ request = (MainThreadRequest) msg.obj;
+ OperatorInfo operator = (OperatorInfo) request.argument;
+ onCompleted = obtainMessage(EVENT_SET_NETWORK_SELECTION_MODE_MANUAL_DONE,
+ request);
+ getPhoneFromRequest(request).selectNetworkManually(operator, onCompleted);
+ break;
+
+ case EVENT_SET_NETWORK_SELECTION_MODE_MANUAL_DONE:
+ handleNullReturnEvent(msg, "setNetworkSelectionModeManual");
+ break;
+
case CMD_GET_MODEM_ACTIVITY_INFO:
request = (MainThreadRequest) msg.obj;
onCompleted = obtainMessage(EVENT_GET_MODEM_ACTIVITY_INFO_DONE, request);
@@ -943,28 +1002,61 @@
Log.e(LOG_TAG, "silenseRinger not supported");
}
- public boolean isOffhook() {
- return isOffhookForSubscriber(getDefaultSubscription());
+ @Override
+ public boolean isOffhook(String callingPackage) {
+ return isOffhookForSubscriber(getDefaultSubscription(), callingPackage);
}
- public boolean isOffhookForSubscriber(int subId) {
- return (getPhone(subId).getState() == PhoneConstants.State.OFFHOOK);
+ @Override
+ public boolean isOffhookForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "isOffhookForSubscriber")) {
+ return false;
+ }
+
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return (phone.getState() == PhoneConstants.State.OFFHOOK);
+ } else {
+ return false;
+ }
}
- public boolean isRinging() {
- return (isRingingForSubscriber(getDefaultSubscription()));
+ @Override
+ public boolean isRinging(String callingPackage) {
+ return (isRingingForSubscriber(getDefaultSubscription(), callingPackage));
}
- public boolean isRingingForSubscriber(int subId) {
- return (getPhone(subId).getState() == PhoneConstants.State.RINGING);
+ @Override
+ public boolean isRingingForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "isRingingForSubscriber")) {
+ return false;
+ }
+
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return (phone.getState() == PhoneConstants.State.RINGING);
+ } else {
+ return false;
+ }
}
- public boolean isIdle() {
- return isIdleForSubscriber(getDefaultSubscription());
+ @Override
+ public boolean isIdle(String callingPackage) {
+ return isIdleForSubscriber(getDefaultSubscription(), callingPackage);
}
- public boolean isIdleForSubscriber(int subId) {
- return (getPhone(subId).getState() == PhoneConstants.State.IDLE);
+ @Override
+ public boolean isIdleForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "isIdleForSubscriber")) {
+ return false;
+ }
+
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return (phone.getState() == PhoneConstants.State.IDLE);
+ } else {
+ return false;
+ }
}
public boolean isSimPinEnabled(String callingPackage) {
@@ -1125,15 +1217,32 @@
// No permission check needed here: this call is harmless, and it's
// needed for the ServiceState.requestStateUpdate() call (which is
// already intentionally exposed to 3rd parties.)
- getPhone(subId).updateServiceLocation();
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ phone.updateServiceLocation();
+ }
}
- public boolean isRadioOn() {
- return isRadioOnForSubscriber(getDefaultSubscription());
+ @Override
+ public boolean isRadioOn(String callingPackage) {
+ return isRadioOnForSubscriber(getDefaultSubscription(), callingPackage);
}
- public boolean isRadioOnForSubscriber(int subId) {
- return getPhone(subId).getServiceState().getState() != ServiceState.STATE_POWER_OFF;
+ @Override
+ public boolean isRadioOnForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "isRadioOnForSubscriber")) {
+ return false;
+ }
+ return isRadioOnForSubscriber(subId);
+ }
+
+ private boolean isRadioOnForSubscriber(int subId) {
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.getServiceState().getState() != ServiceState.STATE_POWER_OFF;
+ } else {
+ return false;
+ }
}
public void toggleRadioOnOff() {
@@ -1143,7 +1252,10 @@
public void toggleRadioOnOffForSubscriber(int subId) {
enforceModifyPermission();
- getPhone(subId).setRadioPower(!isRadioOnForSubscriber(subId));
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ phone.setRadioPower(!isRadioOnForSubscriber(subId));
+ }
}
public boolean setRadio(boolean turnOn) {
@@ -1152,7 +1264,11 @@
public boolean setRadioForSubscriber(int subId, boolean turnOn) {
enforceModifyPermission();
- if ((getPhone(subId).getServiceState().getState() !=
+ final Phone phone = getPhone(subId);
+ if (phone == null) {
+ return false;
+ }
+ if ((phone.getServiceState().getState() !=
ServiceState.STATE_POWER_OFF) != turnOn) {
toggleRadioOnOffForSubscriber(subId);
}
@@ -1193,30 +1309,53 @@
public boolean setRadioPowerForSubscriber(int subId, boolean turnOn) {
enforceModifyPermission();
- getPhone(subId).setRadioPower(turnOn);
- return true;
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ phone.setRadioPower(turnOn);
+ return true;
+ } else {
+ return false;
+ }
}
// FIXME: subId version needed
+ @Override
public boolean enableDataConnectivity() {
enforceModifyPermission();
int subId = mSubscriptionController.getDefaultDataSubId();
- getPhone(subId).setDataEnabled(true);
- return true;
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ phone.setDataEnabled(true);
+ return true;
+ } else {
+ return false;
+ }
}
// FIXME: subId version needed
+ @Override
public boolean disableDataConnectivity() {
enforceModifyPermission();
int subId = mSubscriptionController.getDefaultDataSubId();
- getPhone(subId).setDataEnabled(false);
- return true;
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ phone.setDataEnabled(false);
+ return true;
+ } else {
+ return false;
+ }
}
// FIXME: subId version needed
+ @Override
public boolean isDataConnectivityPossible() {
int subId = mSubscriptionController.getDefaultDataSubId();
- return getPhone(subId).isDataConnectivityPossible();
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.isDataConnectivityPossible();
+ } else {
+ return false;
+ }
}
public boolean handlePinMmi(String dialString) {
@@ -1225,6 +1364,9 @@
public boolean handlePinMmiForSubscriber(int subId, String dialString) {
enforceModifyPermission();
+ if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+ return false;
+ }
return (Boolean) sendRequest(CMD_HANDLE_PIN_MMI, dialString, subId);
}
@@ -1236,14 +1378,24 @@
return DefaultPhoneNotifier.convertCallState(getPhone(subId).getState());
}
+ @Override
public int getDataState() {
Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
- return DefaultPhoneNotifier.convertDataState(phone.getDataConnectionState());
+ if (phone != null) {
+ return DefaultPhoneNotifier.convertDataState(phone.getDataConnectionState());
+ } else {
+ return DefaultPhoneNotifier.convertDataState(PhoneConstants.DataState.DISCONNECTED);
+ }
}
+ @Override
public int getDataActivity() {
Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
- return DefaultPhoneNotifier.convertDataActivityState(phone.getDataActivityState());
+ if (phone != null) {
+ return DefaultPhoneNotifier.convertDataActivityState(phone.getDataActivityState());
+ } else {
+ return TelephonyManager.DATA_ACTIVITY_NONE;
+ }
}
@Override
@@ -1261,6 +1413,9 @@
if (DBG_LOC) log("getCellLocation: is active user");
Bundle data = new Bundle();
Phone phone = getPhone(mSubscriptionController.getDefaultDataSubId());
+ if (phone == null) {
+ return null;
+ }
phone.getCellLocation().fillInNotifierBundle(data);
return data;
} else {
@@ -1288,10 +1443,14 @@
enableLocationUpdatesForSubscriber(getDefaultSubscription());
}
+ @Override
public void enableLocationUpdatesForSubscriber(int subId) {
mApp.enforceCallingOrSelfPermission(
android.Manifest.permission.CONTROL_LOCATION_UPDATES, null);
- getPhone(subId).enableLocationUpdates();
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ phone.enableLocationUpdates();
+ }
}
@Override
@@ -1299,10 +1458,14 @@
disableLocationUpdatesForSubscriber(getDefaultSubscription());
}
+ @Override
public void disableLocationUpdatesForSubscriber(int subId) {
mApp.enforceCallingOrSelfPermission(
android.Manifest.permission.CONTROL_LOCATION_UPDATES, null);
- getPhone(subId).disableLocationUpdates();
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ phone.disableLocationUpdates();
+ }
}
@Override
@@ -1489,24 +1652,40 @@
Log.e(LOG_TAG, "[PhoneIntfMgr] " + msg);
}
+ @Override
public int getActivePhoneType() {
return getActivePhoneTypeForSubscriber(getDefaultSubscription());
}
+ @Override
public int getActivePhoneTypeForSubscriber(int subId) {
- return getPhone(subId).getPhoneType();
+ final Phone phone = getPhone(subId);
+ if (phone == null) {
+ return PhoneConstants.PHONE_TYPE_NONE;
+ } else {
+ return getPhone(subId).getPhoneType();
+ }
}
/**
* Returns the CDMA ERI icon index to display
*/
- public int getCdmaEriIconIndex() {
- return getCdmaEriIconIndexForSubscriber(getDefaultSubscription());
-
+ @Override
+ public int getCdmaEriIconIndex(String callingPackage) {
+ return getCdmaEriIconIndexForSubscriber(getDefaultSubscription(), callingPackage);
}
- public int getCdmaEriIconIndexForSubscriber(int subId) {
- return getPhone(subId).getCdmaEriIconIndex();
+ @Override
+ public int getCdmaEriIconIndexForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getCdmaEriIconIndexForSubscriber")) {
+ return -1;
+ }
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.getCdmaEriIconIndex();
+ } else {
+ return -1;
+ }
}
/**
@@ -1514,32 +1693,54 @@
* 0 - ON
* 1 - FLASHING
*/
- public int getCdmaEriIconMode() {
- return getCdmaEriIconModeForSubscriber(getDefaultSubscription());
+ @Override
+ public int getCdmaEriIconMode(String callingPackage) {
+ return getCdmaEriIconModeForSubscriber(getDefaultSubscription(), callingPackage);
}
- public int getCdmaEriIconModeForSubscriber(int subId) {
- return getPhone(subId).getCdmaEriIconMode();
+ @Override
+ public int getCdmaEriIconModeForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getCdmaEriIconModeForSubscriber")) {
+ return -1;
+ }
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.getCdmaEriIconMode();
+ } else {
+ return -1;
+ }
}
/**
* Returns the CDMA ERI text,
*/
- public String getCdmaEriText() {
- return getCdmaEriTextForSubscriber(getDefaultSubscription());
+ @Override
+ public String getCdmaEriText(String callingPackage) {
+ return getCdmaEriTextForSubscriber(getDefaultSubscription(), callingPackage);
}
- public String getCdmaEriTextForSubscriber(int subId) {
- return getPhone(subId).getCdmaEriText();
+ @Override
+ public String getCdmaEriTextForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getCdmaEriIconTextForSubscriber")) {
+ return null;
+ }
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.getCdmaEriText();
+ } else {
+ return null;
+ }
}
/**
* Returns the CDMA MDN.
*/
+ @Override
public String getCdmaMdn(int subId) {
enforceModifyPermissionOrCarrierPrivilege();
- if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
- return getPhone(subId).getLine1Number();
+ final Phone phone = getPhone(subId);
+ if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA && phone != null) {
+ return phone.getLine1Number();
} else {
return null;
}
@@ -1548,10 +1749,12 @@
/**
* Returns the CDMA MIN.
*/
+ @Override
public String getCdmaMin(int subId) {
enforceModifyPermissionOrCarrierPrivilege();
- if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
- return getPhone(subId).getCdmaMin();
+ final Phone phone = getPhone(subId);
+ if (phone != null && phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+ return phone.getCdmaMin();
} else {
return null;
}
@@ -1585,58 +1788,89 @@
/**
* Returns the unread count of voicemails for a subId
*/
+ @Override
public int getVoiceMessageCountForSubscriber( int subId) {
- return getPhone(subId).getVoiceMessageCount();
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.getVoiceMessageCount();
+ } else {
+ return 0;
+ }
}
/**
- * Returns the data network type
+ * Returns the data network type.
+ * Legacy call, permission-free.
*
* @Deprecated to be removed Q3 2013 use {@link #getDataNetworkType}.
*/
@Override
public int getNetworkType() {
- return getNetworkTypeForSubscriber(getDefaultSubscription());
+ final Phone phone = getPhone(getDefaultSubscription());
+ if (phone != null) {
+ return phone.getServiceState().getDataNetworkType();
+ } else {
+ return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+ }
}
/**
* Returns the network type for a subId
*/
@Override
- public int getNetworkTypeForSubscriber(int subId) {
- return getPhone(subId).getServiceState().getDataNetworkType();
+ public int getNetworkTypeForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getNetworkTypeForSubscriber")) {
+ return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+ }
+
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.getServiceState().getDataNetworkType();
+ } else {
+ return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+ }
}
/**
* Returns the data network type
*/
@Override
- public int getDataNetworkType() {
- return getDataNetworkTypeForSubscriber(getDefaultSubscription());
+ public int getDataNetworkType(String callingPackage) {
+ return getDataNetworkTypeForSubscriber(getDefaultSubscription(), callingPackage);
}
/**
* Returns the data network type for a subId
*/
@Override
- public int getDataNetworkTypeForSubscriber(int subId) {
- return getPhone(subId).getServiceState().getDataNetworkType();
- }
+ public int getDataNetworkTypeForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getDataNetworkTypeForSubscriber")) {
+ return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+ }
- /**
- * Returns the data network type
- */
- @Override
- public int getVoiceNetworkType() {
- return getVoiceNetworkTypeForSubscriber(getDefaultSubscription());
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.getServiceState().getDataNetworkType();
+ } else {
+ return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+ }
}
/**
* Returns the Voice network type for a subId
*/
@Override
- public int getVoiceNetworkTypeForSubscriber(int subId) {
- return getPhone(subId).getServiceState().getVoiceNetworkType();
+ public int getVoiceNetworkTypeForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getDataNetworkTypeForSubscriber")) {
+ return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+ }
+
+ final Phone phone = getPhone(subId);
+ if (phone != null) {
+ return phone.getServiceState().getVoiceNetworkType();
+ } else {
+ return TelephonyManager.NETWORK_TYPE_UNKNOWN;
+ }
}
/**
@@ -1650,10 +1884,12 @@
/**
* @return true if a ICC card is present for a slotId
*/
+ @Override
public boolean hasIccCardUsingSlotId(int slotId) {
int subId[] = mSubscriptionController.getSubIdUsingSlotId(slotId);
- if (subId != null) {
- return getPhone(subId[0]).getIccCard().hasIccCard();
+ final Phone phone = getPhone(subId[0]);
+ if (subId != null && phone != null) {
+ return phone.getIccCard().hasIccCard();
} else {
return false;
}
@@ -1664,15 +1900,27 @@
* is a tri-state return value as for a period of time
* the mode may be unknown.
*
+ * @param callingPackage the name of the package making the call.
* @return {@link Phone#LTE_ON_CDMA_UNKNOWN}, {@link Phone#LTE_ON_CDMA_FALSE}
* or {@link Phone#LTE_ON_CDMA_TRUE}
*/
- public int getLteOnCdmaMode() {
- return getLteOnCdmaModeForSubscriber(getDefaultSubscription());
+ @Override
+ public int getLteOnCdmaMode(String callingPackage) {
+ return getLteOnCdmaModeForSubscriber(getDefaultSubscription(), callingPackage);
}
- public int getLteOnCdmaModeForSubscriber(int subId) {
- return getPhone(subId).getLteOnCdmaMode();
+ @Override
+ public int getLteOnCdmaModeForSubscriber(int subId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getLteOnCdmaModeForSubscriber")) {
+ return PhoneConstants.LTE_ON_CDMA_UNKNOWN;
+ }
+
+ final Phone phone = getPhone(subId);
+ if (phone == null) {
+ return PhoneConstants.LTE_ON_CDMA_UNKNOWN;
+ } else {
+ return phone.getLteOnCdmaMode();
+ }
}
public void setPhone(Phone phone) {
@@ -1938,6 +2186,28 @@
}
/**
+ * Set the network selection mode to manual with the selected carrier.
+ */
+ @Override
+ public boolean setNetworkSelectionModeManual(int subId, OperatorInfo operator) {
+ enforceModifyPermissionOrCarrierPrivilege();
+ if (DBG) log("setNetworkSelectionModeManual: subId:" + subId + " operator:" + operator);
+ return (Boolean) sendRequest(CMD_SET_NETWORK_SELECTION_MODE_MANUAL, operator, subId);
+ }
+
+ /**
+ * Scans for available networks.
+ */
+ @Override
+ public CellNetworkScanResult getCellNetworkScanResults(int subId) {
+ enforceModifyPermissionOrCarrierPrivilege();
+ if (DBG) log("getCellNetworkScanResults: subId " + subId);
+ CellNetworkScanResult result = (CellNetworkScanResult) sendRequest(
+ CMD_PERFORM_NETWORK_SCAN, null, subId);
+ return result;
+ }
+
+ /**
* Get the calculated preferred network type.
* Used for debugging incorrect network type.
*
@@ -2087,7 +2357,7 @@
for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
UiccCard card = UiccController.getInstance().getUiccCard(i);
if (card == null) {
- loge("checkCarrierPrivilegesForPackageAnyPhones: No UICC");
+ // No UICC in that slot.
continue;
}
@@ -2117,7 +2387,8 @@
}
private String getIccId(int subId) {
- UiccCard card = getPhone(subId).getUiccCard();
+ final Phone phone = getPhone(subId);
+ UiccCard card = phone == null ? null : phone.getUiccCard();
if (card == null) {
loge("getIccId: No UICC");
return null;
@@ -2136,7 +2407,11 @@
enforceCarrierPrivilege();
final String iccId = getIccId(subId);
- final String subscriberId = getPhone(subId).getSubscriberId();
+ final Phone phone = getPhone(subId);
+ if (phone == null) {
+ return false;
+ }
+ final String subscriberId = phone.getSubscriberId();
if (DBG_MERGE) {
Slog.d(LOG_TAG, "Setting line number for ICC=" + iccId + ", subscriberId="
@@ -2174,7 +2449,8 @@
@Override
public String getLine1NumberForDisplay(int subId, String callingPackage) {
- if (!canReadPhoneState(callingPackage, "getLine1NumberForDisplay")) {
+ // This is open to apps with WRITE_SMS.
+ if (!canReadPhoneNumber(callingPackage, "getLine1NumberForDisplay")) {
return null;
}
@@ -2201,16 +2477,26 @@
}
@Override
- public String[] getMergedSubscriberIds() {
+ public String[] getMergedSubscriberIds(String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getMergedSubscriberIds")) {
+ return null;
+ }
final Context context = mPhone.getContext();
final TelephonyManager tele = TelephonyManager.from(context);
final SubscriptionManager sub = SubscriptionManager.from(context);
// Figure out what subscribers are currently active
final ArraySet<String> activeSubscriberIds = new ArraySet<>();
- final int[] subIds = sub.getActiveSubscriptionIdList();
- for (int subId : subIds) {
- activeSubscriberIds.add(tele.getSubscriberId(subId));
+ // Clear calling identity, when calling TelephonyManager, because callerUid must be
+ // the process, where TelephonyManager was instantiated. Otherwise AppOps check will fail.
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ final int[] subIds = sub.getActiveSubscriptionIdList();
+ for (int subId : subIds) {
+ activeSubscriberIds.add(tele.getSubscriberId(subId));
+ }
+ } finally {
+ Binder.restoreCallingIdentity(identity);
}
// First pass, find a number override for an active subscriber
@@ -2320,7 +2606,11 @@
}
@Override
- public int getRadioAccessFamily(int phoneId) {
+ public int getRadioAccessFamily(int phoneId, String callingPackage) {
+ if (!canReadPhoneState(callingPackage, "getRadioAccessFamily")) {
+ return RadioAccessFamily.RAF_UNKNOWN;
+ }
+
return ProxyController.getInstance().getRadioAccessFamily(phoneId);
}
@@ -2422,8 +2712,16 @@
}
private boolean canReadPhoneState(String callingPackage, String message) {
- mApp.enforceCallingOrSelfPermission(
- android.Manifest.permission.READ_PHONE_STATE, message);
+ try {
+ mApp.enforceCallingPermission(
+ android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);
+
+ // SKIP checking for run-time permission since obtained PRIVILEDGED
+ return true;
+ } catch (SecurityException e) {
+ mApp.enforceCallingOrSelfPermission(android.Manifest.permission.READ_PHONE_STATE,
+ message);
+ }
if (mAppOps.noteOp(AppOpsManager.OP_READ_PHONE_STATE, Binder.getCallingUid(),
callingPackage) != AppOpsManager.MODE_ALLOWED) {
@@ -2433,6 +2731,16 @@
return true;
}
+ /**
+ * Besides READ_PHONE_STATE, WRITE_SMS also allows apps to get phone numbers.
+ */
+ private boolean canReadPhoneNumber(String callingPackage, String message) {
+ // Note canReadPhoneState() may throw, so we need to do the appops check first.
+ return (mAppOps.noteOp(AppOpsManager.OP_WRITE_SMS,
+ Binder.getCallingUid(), callingPackage) == AppOpsManager.MODE_ALLOWED)
+ || canReadPhoneState(callingPackage, message);
+ }
+
@Override
public void factoryReset(int subId) {
enforceConnectivityInternalPermission();
@@ -2490,21 +2798,36 @@
// Try and fetch the locale from the carrier properties or from the SIM language
// preferences (EF-PL and EF-LI)...
+ final int mcc = info.getMcc();
+ final Locale mccLocale = MccTable.getLocaleFromMcc(mPhone.getContext(), mcc);
final Phone defaultPhone = getPhone(info.getSubscriptionId());
if (defaultPhone != null) {
final Locale localeFromDefaultSim = defaultPhone.getLocaleFromSimAndCarrierPrefs();
if (localeFromDefaultSim != null) {
- return localeFromDefaultSim.toLanguageTag();
+ // The SIM language preferences only store a language (e.g. fr = French), not an
+ // exact locale (e.g. fr_FR = French/France). So, if the locale returned from
+ // the SIM and carrier preferences does not include a country we add the country
+ // determined from the SIM MCC to provide an exact locale.
+ // Note this can result in unusual locale combinatons (e.g. en_DE) being returned.
+ if ((localeFromDefaultSim.getCountry().isEmpty()) && (mccLocale != null)) {
+ final Locale combinedLocale = new Locale (localeFromDefaultSim.getLanguage(),
+ mccLocale.getCountry());
+ if (DBG) log("Using SIM language and mcc country:" + combinedLocale);
+ return combinedLocale.toLanguageTag();
+ } else {
+ if (DBG) log("Using locale from default SIM:" + localeFromDefaultSim);
+ return localeFromDefaultSim.toLanguageTag();
+ }
}
}
// .. if that doesn't work, try and guess the language from the sim MCC.
- final int mcc = info.getMcc();
- final Locale locale = MccTable.getLocaleFromMcc(mPhone.getContext(), mcc);
- if (locale != null) {
- return locale.toLanguageTag();
+ if (mccLocale != null) {
+ if (DBG) log("No locale from default SIM, using mcc locale:" + mccLocale);
+ return mccLocale.toLanguageTag();
}
+ if (DBG) log("No locale found - returning null");
return null;
}
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index a619701..e1f8036 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -30,11 +30,13 @@
import android.net.Uri;
import android.os.Handler;
import android.os.Message;
+import android.os.PersistableBundle;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.VideoProfile;
+import android.telephony.CarrierConfigManager;
import android.telephony.PhoneNumberUtils;
import android.telephony.SubscriptionManager;
import android.text.TextUtils;
@@ -1828,7 +1830,8 @@
if (DBG) log("turnOnNoiseSuppression: " + flag);
AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
- if (!context.getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
+ PersistableBundle b = PhoneGlobals.getInstance().getCarrierConfig();
+ if (!b.getBoolean(CarrierConfigManager.KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL)) {
return;
}
@@ -1850,7 +1853,8 @@
static void restoreNoiseSuppression(Context context) {
if (DBG) log("restoreNoiseSuppression, restoring to: " + sIsNoiseSuppressionEnabled);
- if (!context.getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
+ PersistableBundle b = PhoneGlobals.getInstance().getCarrierConfig();
+ if (!b.getBoolean(CarrierConfigManager.KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL)) {
return;
}
@@ -1862,7 +1866,8 @@
static boolean isNoiseSuppressionOn(Context context) {
- if (!context.getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
+ PersistableBundle b = PhoneGlobals.getInstance().getCarrierConfig();
+ if (!b.getBoolean(CarrierConfigManager.KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL)) {
return false;
}
diff --git a/src/com/android/phone/VvmPhoneStateListener.java b/src/com/android/phone/VvmPhoneStateListener.java
new file mode 100644
index 0000000..d2d84b2
--- /dev/null
+++ b/src/com/android/phone/VvmPhoneStateListener.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+package com.android.phone;
+
+import android.content.Context;
+import android.content.Intent;
+import android.provider.VoicemailContract;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
+
+import com.android.phone.vvm.omtp.OmtpVvmCarrierConfigHelper;
+import com.android.phone.vvm.omtp.sync.OmtpVvmSourceManager;
+import com.android.phone.vvm.omtp.sync.OmtpVvmSyncService;
+import com.android.phone.vvm.omtp.sync.VoicemailStatusQueryHelper;
+
+/**
+ * Check if service is lost and indicate this in the voicemail status.
+ */
+public class VvmPhoneStateListener extends PhoneStateListener {
+
+ private PhoneAccountHandle mPhoneAccount;
+ private Context mContext;
+ public VvmPhoneStateListener(Context context, PhoneAccountHandle accountHandle) {
+ super(PhoneUtils.getSubIdForPhoneAccountHandle(accountHandle));
+ mContext = context;
+ mPhoneAccount = accountHandle;
+ }
+
+ @Override
+ public void onServiceStateChanged(ServiceState serviceState) {
+ if (serviceState.getState() == ServiceState.STATE_IN_SERVICE) {
+ VoicemailStatusQueryHelper voicemailStatusQueryHelper =
+ new VoicemailStatusQueryHelper(mContext);
+ if (voicemailStatusQueryHelper.isVoicemailSourceConfigured(mPhoneAccount)) {
+ if (!voicemailStatusQueryHelper.isNotificationsChannelActive(mPhoneAccount)) {
+ VoicemailContract.Status.setStatus(mContext, mPhoneAccount,
+ VoicemailContract.Status.CONFIGURATION_STATE_OK,
+ VoicemailContract.Status.DATA_CHANNEL_STATE_OK,
+ VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_OK);
+ PhoneGlobals.getInstance().notificationMgr.updateMwi(
+ PhoneUtils.getSubIdForPhoneAccountHandle(mPhoneAccount), false);
+ }
+ }
+
+ if (OmtpVvmSourceManager.getInstance(mContext).isVvmSourceRegistered(mPhoneAccount)) {
+ // If the source is already registered, run a full sync in case something was missed
+ // while signal was down.
+ Intent serviceIntent = OmtpVvmSyncService.getSyncIntent(
+ mContext, OmtpVvmSyncService.SYNC_FULL_SYNC, mPhoneAccount,
+ true /* firstAttempt */);
+ mContext.startService(serviceIntent);
+ } else {
+ // Otherwise initiate an activation because this means that an OMTP source was
+ // recognized but either the activation text was not successfully sent or a response
+ // was not received.
+ OmtpVvmCarrierConfigHelper carrierConfigHelper = new OmtpVvmCarrierConfigHelper(
+ mContext, PhoneUtils.getSubIdForPhoneAccountHandle(mPhoneAccount));
+ carrierConfigHelper.startActivation();
+ }
+ } else {
+ VoicemailContract.Status.setStatus(mContext, mPhoneAccount,
+ VoicemailContract.Status.CONFIGURATION_STATE_OK,
+ VoicemailContract.Status.DATA_CHANNEL_STATE_NO_CONNECTION,
+ VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION);
+ }
+ }
+}
diff --git a/src/com/android/phone/common/mail/MailTransport.java b/src/com/android/phone/common/mail/MailTransport.java
index 99f0272..172d1a9 100644
--- a/src/com/android/phone/common/mail/MailTransport.java
+++ b/src/com/android/phone/common/mail/MailTransport.java
@@ -22,6 +22,8 @@
import com.android.phone.common.mail.utils.LogUtils;
import java.net.SocketAddress;
+import java.util.ArrayList;
+import java.util.List;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
@@ -35,6 +37,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
@@ -92,35 +95,49 @@
public void open() throws MessagingException, CertificateValidationException {
LogUtils.d(TAG, "*** IMAP open " + mHost + ":" + String.valueOf(mPort));
+ List<SocketAddress> socketAddresses = new ArrayList<SocketAddress>();
try {
- SocketAddress socketAddress = new InetSocketAddress(mHost, mPort);
if (canTrySslSecurity()) {
mSocket = HttpsURLConnection.getDefaultSSLSocketFactory().createSocket();
+ socketAddresses.add(new InetSocketAddress(mHost, mPort));
} else {
if (mNetwork == null) {
mSocket = new Socket();
+ socketAddresses.add(new InetSocketAddress(mHost, mPort));
} else {
+ InetAddress[] inetAddresses = mNetwork.getAllByName(mHost);
+ for (int i = 0; i < inetAddresses.length; i++) {
+ socketAddresses.add(new InetSocketAddress(inetAddresses[i], mPort));
+ }
mSocket = mNetwork.getSocketFactory().createSocket();
}
}
- mSocket.connect(socketAddress, SOCKET_CONNECT_TIMEOUT);
- // After the socket connects to an SSL server, confirm that the hostname is as expected
- if (canTrySslSecurity() && !canTrustAllCertificates()) {
- verifyHostname(mSocket, mHost);
- }
-
- mIn = new BufferedInputStream(mSocket.getInputStream(), 1024);
- mOut = new BufferedOutputStream(mSocket.getOutputStream(), 512);
- mSocket.setSoTimeout(SOCKET_READ_TIMEOUT);
- } catch (SSLException e) {
- LogUtils.d(TAG, e.toString());
- throw new CertificateValidationException(e.getMessage(), e);
} catch (IOException ioe) {
LogUtils.d(TAG, ioe.toString());
throw new MessagingException(MessagingException.IOERROR, ioe.toString());
- } catch (IllegalArgumentException iae) {
- LogUtils.d(TAG, iae.toString());
- throw new MessagingException(MessagingException.UNSPECIFIED_EXCEPTION, iae.toString());
+ }
+
+ while (socketAddresses.size() > 0) {
+ try {
+ mSocket.connect(socketAddresses.remove(0), SOCKET_CONNECT_TIMEOUT);
+
+ // After the socket connects to an SSL server, confirm that the hostname is as
+ // expected
+ if (canTrySslSecurity() && !canTrustAllCertificates()) {
+ verifyHostname(mSocket, mHost);
+ }
+
+ mIn = new BufferedInputStream(mSocket.getInputStream(), 1024);
+ mOut = new BufferedOutputStream(mSocket.getOutputStream(), 512);
+ mSocket.setSoTimeout(SOCKET_READ_TIMEOUT);
+ return;
+ } catch (IOException ioe) {
+ LogUtils.d(TAG, ioe.toString());
+ if (socketAddresses.size() == 0) {
+ // Only throw an error when there are no more sockets to try.
+ throw new MessagingException(MessagingException.IOERROR, ioe.toString());
+ }
+ }
}
}
diff --git a/src/com/android/phone/settings/AccessibilitySettingsFragment.java b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
index fdb0cd5..d5a613b 100644
--- a/src/com/android/phone/settings/AccessibilitySettingsFragment.java
+++ b/src/com/android/phone/settings/AccessibilitySettingsFragment.java
@@ -25,6 +25,7 @@
import android.preference.PreferenceScreen;
import android.provider.Settings;
import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -98,9 +99,7 @@
public void onResume() {
super.onResume();
- if (ImsManager.isVolteEnabledByPlatform(mContext) &&
- !mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_carrier_volte_tty_supported)) {
+ if (ImsManager.isVolteEnabledByPlatform(mContext) && !getVolteTtySupported()) {
TelephonyManager tm =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
@@ -111,9 +110,7 @@
public void onPause() {
super.onPause();
- if (ImsManager.isVolteEnabledByPlatform(mContext) &&
- !mContext.getResources().getBoolean(
- com.android.internal.R.bool.config_carrier_volte_tty_supported)) {
+ if (ImsManager.isVolteEnabledByPlatform(mContext) && !getVolteTtySupported()) {
TelephonyManager tm =
(TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
@@ -138,4 +135,11 @@
}
return false;
}
+
+ private boolean getVolteTtySupported() {
+ CarrierConfigManager configManager =
+ (CarrierConfigManager) mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+ return configManager.getConfig().getBoolean(
+ CarrierConfigManager.KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL);
+ }
}
diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index 112610b..c08b32a 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -18,6 +18,8 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
import com.android.internal.telephony.Phone;
import com.android.phone.PhoneUtils;
@@ -48,6 +50,9 @@
private static final String USE_SIP_PREF_KEY = "use_sip_calling_options_key";
private static final String SIP_RECEIVE_CALLS_PREF_KEY = "sip_receive_calls_key";
+ private static final String LEGACY_ACTION_CONFIGURE_PHONE_ACCOUNT =
+ "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
+
/**
* Value to start ordering of phone accounts relative to other preferences. By setting this
* value on the phone account listings, we ensure that anything that is ordered before
@@ -56,7 +61,7 @@
*/
private static final int ACCOUNT_ORDERING_START_VALUE = 100;
- private String LOG_TAG = PhoneAccountSettingsFragment.class.getSimpleName();
+ private static final String LOG_TAG = PhoneAccountSettingsFragment.class.getSimpleName();
private TelecomManager mTelecomManager;
private TelephonyManager mTelephonyManager;
@@ -346,18 +351,7 @@
}
}
} else {
- // Build the settings intent.
- intent = new Intent(TelecomManager.ACTION_CONNECTION_SERVICE_CONFIGURE);
- intent.setPackage(handle.getComponentName().getPackageName());
- intent.addCategory(Intent.CATEGORY_DEFAULT);
- intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, handle);
-
- // Check to see that the phone account package can handle the setting intent.
- PackageManager pm = getActivity().getPackageManager();
- List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
- if (resolutions.size() == 0) {
- intent = null; // set no intent if the package cannot handle it.
- }
+ intent = buildPhoneAccountConfigureIntent(getActivity(), handle);
}
// Create the preference & add the label
@@ -366,7 +360,9 @@
// Add an icon.
Icon icon = account.getIcon();
- accountPreference.setIcon(icon.loadDrawable(getActivity()));
+ if (icon != null) {
+ accountPreference.setIcon(icon.loadDrawable(getActivity()));
+ }
// Add an intent to send the user to the account's settings.
if (intent != null) {
@@ -415,4 +411,43 @@
return PhoneUtils.makePstnPhoneAccountHandleWithPrefix(
(Phone) null, "" /* prefix */, true /* isEmergency */);
}
+
+ public static Intent buildPhoneAccountConfigureIntent(
+ Context context, PhoneAccountHandle accountHandle) {
+ Intent intent = buildConfigureIntent(
+ context, accountHandle, TelecomManager.ACTION_CONFIGURE_PHONE_ACCOUNT);
+
+ if (intent == null) {
+ // If the new configuration didn't work, try the old configuration intent.
+ intent = buildConfigureIntent(
+ context, accountHandle, LEGACY_ACTION_CONFIGURE_PHONE_ACCOUNT);
+ if (intent != null) {
+ Log.w(LOG_TAG, "Phone account using old configuration intent: " + accountHandle);
+ }
+ }
+ return intent;
+ }
+
+ private static Intent buildConfigureIntent(
+ Context context, PhoneAccountHandle accountHandle, String actionStr) {
+ if (accountHandle == null || accountHandle.getComponentName() == null ||
+ TextUtils.isEmpty(accountHandle.getComponentName().getPackageName())) {
+ return null;
+ }
+
+ // Build the settings intent.
+ Intent intent = new Intent(actionStr);
+ intent.setPackage(accountHandle.getComponentName().getPackageName());
+ intent.addCategory(Intent.CATEGORY_DEFAULT);
+ intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, accountHandle);
+
+ // Check to see that the phone account package can handle the setting intent.
+ PackageManager pm = context.getPackageManager();
+ List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+ if (resolutions.size() == 0) {
+ intent = null; // set no intent if the package cannot handle it.
+ }
+
+ return intent;
+ }
}
diff --git a/src/com/android/phone/settings/VisualVoicemailSettingsUtil.java b/src/com/android/phone/settings/VisualVoicemailSettingsUtil.java
index d2e797b..45ad1cb 100644
--- a/src/com/android/phone/settings/VisualVoicemailSettingsUtil.java
+++ b/src/com/android/phone/settings/VisualVoicemailSettingsUtil.java
@@ -40,6 +40,12 @@
// however, the user can override this setting.
private static final String IS_USER_SET = "is_user_set";
+ // Setting for how often retries should be done.
+ private static final String SYNC_RETRY_INTERVAL = "sync_retry_interval";
+ private static final long MAX_SYNC_RETRY_INTERVAL_MS = 86400000; // 24 hours
+ private static final long DEFAULT_SYNC_RETRY_INTERVAL_MS = 900000; // 15 minutes
+
+
public static void setVisualVoicemailEnabled(Phone phone, boolean isEnabled,
boolean isUserSet) {
setVisualVoicemailEnabled(phone.getContext(), PhoneUtils.makePstnPhoneAccountHandle(phone),
@@ -73,12 +79,6 @@
PhoneUtils.makePstnPhoneAccountHandle(phone));
}
- public static boolean isEnabledByUserOverride(Context context,
- PhoneAccountHandle phoneAccount) {
- return isVisualVoicemailUserSet(context, phoneAccount) &&
- isVisualVoicemailEnabled(context, phoneAccount);
- }
-
/**
* Differentiate user-enabled/disabled to know whether to ignore automatic enabling and
* disabling by the system. This is relevant when a carrier vvm app is installed and the user
@@ -121,6 +121,27 @@
return prefs.getString(getVisualVoicemailSharedPrefsKey(key, phoneAccount), null);
}
+ public static long getVisualVoicemailRetryInterval(Context context,
+ PhoneAccountHandle phoneAccount) {
+ SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+ return prefs.getLong(getVisualVoicemailSharedPrefsKey(SYNC_RETRY_INTERVAL, phoneAccount),
+ DEFAULT_SYNC_RETRY_INTERVAL_MS);
+ }
+
+ public static void resetVisualVoicemailRetryInterval(Context context,
+ PhoneAccountHandle phoneAccount) {
+ setVisualVoicemailRetryInterval(context, phoneAccount, DEFAULT_SYNC_RETRY_INTERVAL_MS);
+ }
+
+ public static void setVisualVoicemailRetryInterval(Context context,
+ PhoneAccountHandle phoneAccount, long interval) {
+ SharedPreferences.Editor editor =
+ PreferenceManager.getDefaultSharedPreferences(context).edit();
+ editor.putLong(getVisualVoicemailSharedPrefsKey(SYNC_RETRY_INTERVAL, phoneAccount),
+ Math.min(interval, MAX_SYNC_RETRY_INTERVAL_MS));
+ editor.commit();
+ }
+
private static String getVisualVoicemailSharedPrefsKey(String key,
PhoneAccountHandle phoneAccount) {
return VISUAL_VOICEMAIL_SHARED_PREFS_KEY_PREFIX + key + "_" + phoneAccount.getId();
diff --git a/src/com/android/phone/settings/VoicemailSettingsActivity.java b/src/com/android/phone/settings/VoicemailSettingsActivity.java
index 149cf0a..bb8c6fe 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -392,6 +392,7 @@
boolean isEnabled = (Boolean) objValue;
VisualVoicemailSettingsUtil.setVisualVoicemailEnabled(mPhone, isEnabled, true);
if (isEnabled) {
+ OmtpVvmSourceManager.getInstance(mPhone.getContext()).addPhoneStateListener(mPhone);
mOmtpVvmCarrierConfigHelper.startActivation();
} else {
OmtpVvmSourceManager.getInstance(mPhone.getContext()).removeSource(mPhone);
@@ -707,8 +708,6 @@
}
showDialogIfForeground(VoicemailDialogUtil.VM_FWD_READING_DIALOG);
}
-
- PhoneGlobals.getInstance().refreshMwiIndicator(mSubscriptionInfoHelper.getSubId());
}
private final Handler mGetOptionComplete = new Handler() {
@@ -820,6 +819,8 @@
case EVENT_VOICEMAIL_CHANGED:
mVoicemailChangeResult = result;
mVMChangeCompletedSuccessfully = isVmChangeSuccess();
+ PhoneGlobals.getInstance().refreshMwiIndicator(
+ mSubscriptionInfoHelper.getSubId());
done = true;
break;
case EVENT_FORWARDING_CHANGED:
diff --git a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
index 0823552..5ffc9ea 100644
--- a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
+++ b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
@@ -21,7 +21,6 @@
import android.telecom.PhoneAccountHandle;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
import android.util.Log;
import com.android.internal.telephony.IccCardConstants;
@@ -68,20 +67,30 @@
PhoneAccountHandle phoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
SubscriptionManager.getPhoneId(subId));
- if (carrierConfigHelper.isEnabledByDefault()) {
- VisualVoicemailSettingsUtil.setVisualVoicemailEnabled(
- context, phoneAccount, true, false);
+ boolean isUserSet = VisualVoicemailSettingsUtil.isVisualVoicemailUserSet(
+ context, phoneAccount);
+ boolean isEnabledInSettings =
+ VisualVoicemailSettingsUtil.isVisualVoicemailEnabled(context,
+ phoneAccount);
+ boolean isEnabled = isUserSet ? isEnabledInSettings :
+ carrierConfigHelper.isEnabledByDefault();
+
+ if (!isUserSet) {
+ // Preserve the previous setting for "isVisualVoicemailEnabled" if it is
+ // set by the user, otherwise, set this value for the first time.
+ VisualVoicemailSettingsUtil.setVisualVoicemailEnabled(context, phoneAccount,
+ isEnabled, /** isUserSet */ false);
}
- if (carrierConfigHelper.isEnabledByDefault() ||
- VisualVoicemailSettingsUtil.isEnabledByUserOverride(
- context, phoneAccount)) {
+ if (isEnabled) {
+ // Add a phone state listener so that changes to the communication channels
+ // can be recorded.
+ OmtpVvmSourceManager.getInstance(context).addPhoneStateListener(
+ phoneAccount);
carrierConfigHelper.startActivation();
} else {
// It may be that the source was not registered to begin with but we want
// to run through the steps to remove the source just in case.
- VisualVoicemailSettingsUtil.setVisualVoicemailEnabled(
- context, phoneAccount, false, false);
OmtpVvmSourceManager.getInstance(context).removeSource(phoneAccount);
carrierConfigHelper.startDeactivation();
}
diff --git a/src/com/android/phone/vvm/omtp/VvmPackageInstallReceiver.java b/src/com/android/phone/vvm/omtp/VvmPackageInstallReceiver.java
index 5559feb..0c4eb62 100644
--- a/src/com/android/phone/vvm/omtp/VvmPackageInstallReceiver.java
+++ b/src/com/android/phone/vvm/omtp/VvmPackageInstallReceiver.java
@@ -45,8 +45,8 @@
OmtpVvmSourceManager vvmSourceManager = OmtpVvmSourceManager.getInstance(context);
Set<PhoneAccountHandle> phoneAccounts = vvmSourceManager.getOmtpVvmSources();
for (PhoneAccountHandle phoneAccount : phoneAccounts) {
- if (VisualVoicemailSettingsUtil.isEnabledByUserOverride(context, phoneAccount)) {
- // Skip the check if this voicemail source is enabled by the user.
+ if (VisualVoicemailSettingsUtil.isVisualVoicemailUserSet(context, phoneAccount)) {
+ // Skip the check if this voicemail source's setting is overridden by the user.
continue;
}
diff --git a/src/com/android/phone/vvm/omtp/fetch/FetchVoicemailReceiver.java b/src/com/android/phone/vvm/omtp/fetch/FetchVoicemailReceiver.java
index de2ccf5..43724e4 100644
--- a/src/com/android/phone/vvm/omtp/fetch/FetchVoicemailReceiver.java
+++ b/src/com/android/phone/vvm/omtp/fetch/FetchVoicemailReceiver.java
@@ -53,6 +53,9 @@
// Timeout used to call ConnectivityManager.requestNetwork
private static final int NETWORK_REQUEST_TIMEOUT_MILLIS = 60 * 1000;
+ // Number of retries
+ private static final int NETWORK_RETRY_COUNT = 3;
+
private ContentResolver mContentResolver;
private Uri mUri;
private NetworkRequest mNetworkRequest;
@@ -61,6 +64,7 @@
private String mUid;
private ConnectivityManager mConnectivityManager;
private PhoneAccountHandle mPhoneAccount;
+ private int mRetryCount = NETWORK_RETRY_COUNT;
@Override
public void onReceive(final Context context, Intent intent) {
@@ -107,15 +111,14 @@
}
int subId = PhoneUtils.getSubIdForPhoneAccountHandle(mPhoneAccount);
-
mNetworkRequest = new NetworkRequest.Builder()
- .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
- .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
- .setNetworkSpecifier(Integer.toString(subId))
- .build();
+ .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+ .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+ .setNetworkSpecifier(Integer.toString(subId))
+ .build();
+
mNetworkCallback = new OmtpVvmNetworkRequestCallback();
- getConnectivityManager().requestNetwork(
- mNetworkRequest, mNetworkCallback, NETWORK_REQUEST_TIMEOUT_MILLIS);
+ requestNetwork();
}
} finally {
cursor.close();
@@ -130,9 +133,23 @@
executor.execute(new Runnable() {
@Override
public void run() {
- new ImapHelper(mContext, mPhoneAccount, network).fetchVoicemailPayload(
- new VoicemailFetchedCallback(mContext, mUri), mUid);
- releaseNetwork();
+ while (mRetryCount > 0) {
+ ImapHelper imapHelper = new ImapHelper(mContext, mPhoneAccount, network);
+ if (!imapHelper.isSuccessfullyInitialized()) {
+ Log.w(TAG, "Can't retrieve Imap credentials.");
+ releaseNetwork();
+ return;
+ }
+
+ boolean success = imapHelper.fetchVoicemailPayload(
+ new VoicemailFetchedCallback(mContext, mUri), mUid);
+ if (!success && mRetryCount > 0) {
+ mRetryCount--;
+ } else {
+ releaseNetwork();
+ return;
+ }
+ }
}
});
}
@@ -140,14 +157,29 @@
@Override
public void onLost(Network network) {
releaseNetwork();
+
+ if (mRetryCount > 0) {
+ mRetryCount--;
+ requestNetwork();
+ }
}
@Override
public void onUnavailable() {
releaseNetwork();
+
+ if (mRetryCount > 0) {
+ mRetryCount--;
+ requestNetwork();
+ }
}
}
+ private void requestNetwork() {
+ getConnectivityManager().requestNetwork(
+ mNetworkRequest, mNetworkCallback, NETWORK_REQUEST_TIMEOUT_MILLIS);
+ }
+
private void releaseNetwork() {
getConnectivityManager().unregisterNetworkCallback(mNetworkCallback);
}
diff --git a/src/com/android/phone/vvm/omtp/imap/ImapHelper.java b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
index e23dd41..1d20dbd 100644
--- a/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
+++ b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
@@ -79,10 +79,19 @@
mImapStore = new ImapStore(
context, username, password, port, serverName, ImapStore.FLAG_NONE, network);
} catch (NumberFormatException e) {
- LogUtils.e(TAG, e, "Could not parse port number");
+ LogUtils.w(TAG, "Could not parse port number");
}
}
+ /**
+ * If mImapStore is null, this means that there was a missing or badly formatted port number,
+ * which means there aren't sufficient credentials for login. If mImapStore is succcessfully
+ * initialized, then ImapHelper is ready to go.
+ */
+ public boolean isSuccessfullyInitialized() {
+ return mImapStore != null;
+ }
+
/** The caller thread will block until the method returns. */
public boolean markMessagesAsRead(List<Voicemail> voicemails) {
return setFlags(voicemails, Flag.SEEN);
@@ -175,21 +184,23 @@
}
- public void fetchVoicemailPayload(VoicemailFetchedCallback callback, final String uid) {
+ public boolean fetchVoicemailPayload(VoicemailFetchedCallback callback, final String uid) {
Message message;
try {
mFolder = openImapFolder(ImapFolder.MODE_READ_WRITE);
if (mFolder == null) {
// This means we were unable to successfully open the folder.
- return;
+ return false;
}
message = mFolder.getMessage(uid);
VoicemailPayload voicemailPayload = fetchVoicemailPayload(message);
callback.setVoicemailContent(voicemailPayload);
+ return true;
} catch (MessagingException e) {
} finally {
closeImapFolder();
}
+ return false;
}
/**
diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java b/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
index 867a14f..d768e17 100644
--- a/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
@@ -66,8 +66,13 @@
if (messageData != null) {
if (messageData.getPrefix() == OmtpConstants.SYNC_SMS_PREFIX) {
SyncMessage message = new SyncMessage(messageData);
+
+ Log.v(TAG, "Received SYNC sms for " + mPhoneAccount.getId() +
+ " with event" + message.getSyncTriggerEvent());
+
processSync(message);
} else if (messageData.getPrefix() == OmtpConstants.STATUS_SMS_PREFIX) {
+ Log.v(TAG, "Received STATUS sms for " + mPhoneAccount.getId());
StatusMessage message = new StatusMessage(messageData);
updateSource(message);
} else {
@@ -99,9 +104,9 @@
queryHelper.insertIfUnique(voicemail);
break;
case OmtpConstants.MAILBOX_UPDATE:
- Intent serviceIntent = new Intent(mContext, OmtpVvmSyncService.class);
- serviceIntent.setAction(OmtpVvmSyncService.SYNC_DOWNLOAD_ONLY);
- serviceIntent.putExtra(OmtpVvmSyncService.EXTRA_PHONE_ACCOUNT, mPhoneAccount);
+ Intent serviceIntent = OmtpVvmSyncService.getSyncIntent(
+ mContext, OmtpVvmSyncService.SYNC_DOWNLOAD_ONLY, mPhoneAccount,
+ true /* firstAttempt */);
mContext.startService(serviceIntent);
break;
case OmtpConstants.GREETINGS_UPDATE:
@@ -116,24 +121,32 @@
private void updateSource(StatusMessage message) {
OmtpVvmSourceManager vvmSourceManager =
OmtpVvmSourceManager.getInstance(mContext);
- VoicemailContract.Status.setStatus(mContext, mPhoneAccount,
- VoicemailContract.Status.CONFIGURATION_STATE_OK,
- VoicemailContract.Status.DATA_CHANNEL_STATE_OK,
- VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_OK);
- // Save the IMAP credentials in the corresponding account object so they are
- // persistent and can be retrieved.
- VisualVoicemailSettingsUtil.setVisualVoicemailCredentialsFromStatusMessage(
- mContext,
- mPhoneAccount,
- message);
+ if (OmtpConstants.SUCCESS.equals(message.getReturnCode())) {
+ VoicemailContract.Status.setStatus(mContext, mPhoneAccount,
+ VoicemailContract.Status.CONFIGURATION_STATE_OK,
+ VoicemailContract.Status.DATA_CHANNEL_STATE_OK,
+ VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_OK);
- // Add a phone state listener so that changes to the communication channels can be recorded.
- vvmSourceManager.addPhoneStateListener(mPhoneAccount);
+ // Save the IMAP credentials in preferences so they are persistent and can be retrieved.
+ VisualVoicemailSettingsUtil.setVisualVoicemailCredentialsFromStatusMessage(
+ mContext,
+ mPhoneAccount,
+ message);
- Intent serviceIntent = new Intent(mContext, OmtpVvmSyncService.class);
- serviceIntent.setAction(OmtpVvmSyncService.SYNC_FULL_SYNC);
- serviceIntent.putExtra(OmtpVvmSyncService.EXTRA_PHONE_ACCOUNT, mPhoneAccount);
- mContext.startService(serviceIntent);
+ // Add the source to indicate that it is active.
+ vvmSourceManager.addSource(mPhoneAccount);
+
+ Intent serviceIntent = OmtpVvmSyncService.getSyncIntent(
+ mContext, OmtpVvmSyncService.SYNC_FULL_SYNC, mPhoneAccount,
+ true /* firstAttempt */);
+ mContext.startService(serviceIntent);
+ } else {
+ Log.w(TAG, "Visual voicemail not available for subscriber.");
+ // Override default isEnabled setting to false since visual voicemail is unable to
+ // be accessed for some reason.
+ VisualVoicemailSettingsUtil.setVisualVoicemailEnabled(mContext, mPhoneAccount,
+ /* isEnabled */ false, /* isUserSet */ true);
+ }
}
}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSourceManager.java b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSourceManager.java
index 37fb5e4..286dde3 100644
--- a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSourceManager.java
+++ b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSourceManager.java
@@ -24,9 +24,10 @@
import com.android.internal.telephony.Phone;
import com.android.phone.PhoneUtils;
-import com.android.phone.settings.VisualVoicemailSettingsUtil;
+import com.android.phone.VvmPhoneStateListener;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -45,6 +46,7 @@
private TelephonyManager mTelephonyManager;
// Each phone account is associated with a phone state listener for updates to whether the
// device is able to sync.
+ private Set<PhoneAccountHandle> mActiveVvmSources;
private Map<PhoneAccountHandle, PhoneStateListener> mPhoneStateListenerMap;
/**
@@ -67,18 +69,22 @@
mSubscriptionManager = SubscriptionManager.from(context);
mTelephonyManager = (TelephonyManager)
mContext.getSystemService(Context.TELEPHONY_SERVICE);
+ mActiveVvmSources = new HashSet<PhoneAccountHandle>();
mPhoneStateListenerMap = new HashMap<PhoneAccountHandle, PhoneStateListener>();
}
}
+ public void addSource(PhoneAccountHandle phoneAccount) {
+ mActiveVvmSources.add(phoneAccount);
+ }
+
/**
* When a voicemail source is removed, we don't always know which one was removed. Check the
* list of registered phone accounts against the active subscriptions list and remove the
* inactive sources.
*/
public void removeInactiveSources() {
- Set<PhoneAccountHandle> phoneAccounts = getOmtpVvmSources();
- for (PhoneAccountHandle phoneAccount : phoneAccounts) {
+ for (PhoneAccountHandle phoneAccount : mActiveVvmSources) {
if (!PhoneUtils.isPhoneAccountActive(mSubscriptionManager, phoneAccount)) {
removeSource(phoneAccount);
}
@@ -95,6 +101,12 @@
VoicemailContract.Status.DATA_CHANNEL_STATE_NO_CONNECTION,
VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION);
removePhoneStateListener(phoneAccount);
+ mActiveVvmSources.remove(phoneAccount);
+ OmtpVvmSyncService.cancelAllRetries(mContext, phoneAccount);
+ }
+
+ public void addPhoneStateListener(Phone phone) {
+ addPhoneStateListener(PhoneUtils.makePstnPhoneAccountHandle(phone));
}
public void addPhoneStateListener(PhoneAccountHandle phoneAccount) {
@@ -113,27 +125,21 @@
}
public Set<PhoneAccountHandle> getOmtpVvmSources() {
- return mPhoneStateListenerMap.keySet();
+ return mActiveVvmSources;
}
/**
* Check if a certain account is registered.
*
* @param phoneAccount The account to look for.
- * @return {@code true} if the account is in the list of registered OMTP voicemail sync
- * accounts. {@code false} otherwise.
+ * @return {@code true} if the account is in the list of registered OMTP voicemail sources.
+ * {@code false} otherwise.
*/
public boolean isVvmSourceRegistered(PhoneAccountHandle phoneAccount) {
if (phoneAccount == null) {
return false;
}
- Set<PhoneAccountHandle> sources = getOmtpVvmSources();
- for (PhoneAccountHandle source : sources) {
- if (phoneAccount.equals(source)) {
- return true;
- }
- }
- return false;
+ return mActiveVvmSources.contains(phoneAccount);
}
}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncService.java b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncService.java
index 59f5120..363aab9 100644
--- a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncService.java
+++ b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncService.java
@@ -15,7 +15,9 @@
*/
package com.android.phone.vvm.omtp.sync;
+import android.app.AlarmManager;
import android.app.IntentService;
+import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
@@ -55,14 +57,72 @@
// Timeout used to call ConnectivityManager.requestNetwork
private static final int NETWORK_REQUEST_TIMEOUT_MILLIS = 60 * 1000;
- private VoicemailsQueryHelper mQueryHelper;
+ // Number of retries
+ private static final int NETWORK_RETRY_COUNT = 6;
+ private VoicemailsQueryHelper mQueryHelper;
private ConnectivityManager mConnectivityManager;
public OmtpVvmSyncService() {
super("OmtpVvmSyncService");
}
+ public static Intent getSyncIntent(Context context, String action,
+ PhoneAccountHandle phoneAccount, boolean firstAttempt) {
+ if (firstAttempt) {
+ if (phoneAccount != null) {
+ VisualVoicemailSettingsUtil.resetVisualVoicemailRetryInterval(context,
+ phoneAccount);
+ } else {
+ OmtpVvmSourceManager vvmSourceManager =
+ OmtpVvmSourceManager.getInstance(context);
+ Set<PhoneAccountHandle> sources = vvmSourceManager.getOmtpVvmSources();
+ for (PhoneAccountHandle source : sources) {
+ VisualVoicemailSettingsUtil.resetVisualVoicemailRetryInterval(context, source);
+ }
+ }
+ }
+
+ Intent serviceIntent = new Intent(context, OmtpVvmSyncService.class);
+ serviceIntent.setAction(action);
+ if (phoneAccount != null) {
+ serviceIntent.putExtra(EXTRA_PHONE_ACCOUNT, phoneAccount);
+ }
+
+ cancelRetriesForIntent(context, serviceIntent);
+ return serviceIntent;
+ }
+
+ /**
+ * Cancel all retry syncs for an account.
+ * @param context The context the service runs in.
+ * @param phoneAccount The phone account for which to cancel syncs.
+ */
+ public static void cancelAllRetries(Context context, PhoneAccountHandle phoneAccount) {
+ cancelRetriesForIntent(context, getSyncIntent(context, SYNC_FULL_SYNC, phoneAccount,
+ false));
+ }
+
+ /**
+ * A helper method to cancel all pending alarms for intents that would be identical to the given
+ * intent.
+ * @param context The context the service runs in.
+ * @param intent The intent to search and cancel.
+ */
+ private static void cancelRetriesForIntent(Context context, Intent intent) {
+ AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+ alarmManager.cancel(PendingIntent.getService(context, 0, intent, 0));
+
+ Intent copyIntent = new Intent(intent);
+ if (SYNC_FULL_SYNC.equals(copyIntent.getAction())) {
+ // A full sync action should also cancel both of the other types of syncs
+ copyIntent.setAction(SYNC_DOWNLOAD_ONLY);
+ alarmManager.cancel(PendingIntent.getService(context, 0, copyIntent, 0));
+ copyIntent.setAction(SYNC_UPLOAD_ONLY);
+ alarmManager.cancel(PendingIntent.getService(context, 0, copyIntent, 0));
+ }
+ }
+
@Override
public void onCreate() {
super.onCreate();
@@ -80,76 +140,144 @@
PhoneAccountHandle phoneAccount = intent.getParcelableExtra(EXTRA_PHONE_ACCOUNT);
if (phoneAccount != null) {
Log.v(TAG, "Sync requested: " + action + " - for account: " + phoneAccount);
- doSync(phoneAccount, action);
+ setupAndSendNetworkRequest(phoneAccount, action);
} else {
Log.v(TAG, "Sync requested: " + action + " - for all accounts");
OmtpVvmSourceManager vvmSourceManager =
OmtpVvmSourceManager.getInstance(this);
Set<PhoneAccountHandle> sources = vvmSourceManager.getOmtpVvmSources();
for (PhoneAccountHandle source : sources) {
- doSync(source, action);
+ setupAndSendNetworkRequest(source, action);
}
}
}
- private void doSync(PhoneAccountHandle phoneAccount, String action) {
+ private void setupAndSendNetworkRequest(PhoneAccountHandle phoneAccount, String action) {
if (!VisualVoicemailSettingsUtil.isVisualVoicemailEnabled(this, phoneAccount)) {
Log.v(TAG, "Sync requested for disabled account");
return;
}
- int subId = PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccount);
-
- NetworkRequest networkRequest = new NetworkRequest.Builder()
- .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
- .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
- .setNetworkSpecifier(Integer.toString(subId))
- .build();
- NetworkCallback networkCallback = new OmtpVvmNetworkRequestCallback(this, phoneAccount,
- action);
- getConnectivityManager().requestNetwork(
- networkRequest, networkCallback, NETWORK_REQUEST_TIMEOUT_MILLIS);
+ OmtpVvmNetworkRequestCallback networkCallback = new OmtpVvmNetworkRequestCallback(this,
+ phoneAccount, action);
+ requestNetwork(networkCallback);
}
private class OmtpVvmNetworkRequestCallback extends ConnectivityManager.NetworkCallback {
Context mContext;
PhoneAccountHandle mPhoneAccount;
String mAction;
+ NetworkRequest mNetworkRequest;
+ int mRetryCount;
public OmtpVvmNetworkRequestCallback(Context context, PhoneAccountHandle phoneAccount,
String action) {
mContext = context;
mPhoneAccount = phoneAccount;
mAction = action;
+ mNetworkRequest = new NetworkRequest.Builder()
+ .addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+ .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+ .setNetworkSpecifier(
+ Integer.toString(PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccount)))
+ .build();
+ mRetryCount = NETWORK_RETRY_COUNT;
+ }
+
+ public NetworkRequest getNetworkRequest() {
+ return mNetworkRequest;
}
@Override
public void onAvailable(final Network network) {
- ImapHelper imapHelper = new ImapHelper(mContext, mPhoneAccount, network);
- if (SYNC_FULL_SYNC.equals(mAction) || SYNC_UPLOAD_ONLY.equals(mAction)) {
- upload(imapHelper);
+ boolean uploadSuccess;
+ boolean downloadSuccess;
+
+ while (mRetryCount > 0) {
+ uploadSuccess = true;
+ downloadSuccess = true;
+
+ ImapHelper imapHelper = new ImapHelper(mContext, mPhoneAccount, network);
+ if (!imapHelper.isSuccessfullyInitialized()) {
+ Log.w(TAG, "Can't retrieve Imap credentials.");
+ releaseNetwork(this);
+ VisualVoicemailSettingsUtil.resetVisualVoicemailRetryInterval(mContext,
+ mPhoneAccount);
+ return;
+ }
+
+ if (SYNC_FULL_SYNC.equals(mAction) || SYNC_UPLOAD_ONLY.equals(mAction)) {
+ uploadSuccess = upload(imapHelper);
+ }
+ if (SYNC_FULL_SYNC.equals(mAction) || SYNC_DOWNLOAD_ONLY.equals(mAction)) {
+ downloadSuccess = download(imapHelper);
+ }
+
+ Log.v(TAG, "upload succeeded: ["+ String.valueOf(uploadSuccess)
+ + "] download succeeded: [" + String.valueOf(downloadSuccess) + "]");
+
+ // Need to check again for whether visual voicemail is enabled because it could have
+ // been disabled while waiting for the response from the network.
+ if (VisualVoicemailSettingsUtil.isVisualVoicemailEnabled(mContext, mPhoneAccount) &&
+ (!uploadSuccess || !downloadSuccess)) {
+ mRetryCount--;
+ // Re-adjust so that only the unsuccessful action needs to be retried.
+ // No need to re-adjust if both are unsuccessful. It means the full sync
+ // failed so the action remains unchanged.
+ if (uploadSuccess) {
+ mAction = SYNC_DOWNLOAD_ONLY;
+ } else if (downloadSuccess) {
+ mAction = SYNC_UPLOAD_ONLY;
+ }
+
+ Log.v(TAG, "Retrying " + mAction);
+ } else {
+ // Nothing more to do here, just exit.
+ releaseNetwork(this);
+ VisualVoicemailSettingsUtil.resetVisualVoicemailRetryInterval(mContext,
+ mPhoneAccount);
+ return;
+ }
}
- if (SYNC_FULL_SYNC.equals(mAction) || SYNC_DOWNLOAD_ONLY.equals(mAction)) {
- download(imapHelper);
- }
- releaseNetwork();
+
+ releaseNetwork(this);
+ setRetryAlarm(mPhoneAccount, mAction);
}
@Override
public void onLost(Network network) {
- releaseNetwork();
+ releaseNetwork(this);
+
+ if (mRetryCount > 0) {
+ mRetryCount--;
+ requestNetwork(this);
+ } else {
+ setRetryAlarm(mPhoneAccount, mAction);
+ }
}
@Override
public void onUnavailable() {
- releaseNetwork();
- }
+ releaseNetwork(this);
- private void releaseNetwork() {
- getConnectivityManager().unregisterNetworkCallback(this);
+ if (mRetryCount> 0) {
+ mRetryCount--;
+ requestNetwork(this);
+ } else {
+ setRetryAlarm(mPhoneAccount, mAction);
+ }
}
}
+ private void requestNetwork(OmtpVvmNetworkRequestCallback networkCallback) {
+ getConnectivityManager().requestNetwork(networkCallback.getNetworkRequest(),
+ networkCallback, NETWORK_REQUEST_TIMEOUT_MILLIS);
+ }
+
+ private void releaseNetwork(NetworkCallback networkCallback) {
+ getConnectivityManager().unregisterNetworkCallback(networkCallback);
+ }
+
private ConnectivityManager getConnectivityManager() {
if (mConnectivityManager == null) {
mConnectivityManager = (ConnectivityManager) this.getSystemService(
@@ -158,29 +286,59 @@
return mConnectivityManager;
}
- private void upload(ImapHelper imapHelper) {
+ private void setRetryAlarm(PhoneAccountHandle phoneAccount, String action) {
+ Intent serviceIntent = new Intent(this, OmtpVvmSyncService.class);
+ serviceIntent.setAction(action);
+ serviceIntent.putExtra(OmtpVvmSyncService.EXTRA_PHONE_ACCOUNT, phoneAccount);
+ PendingIntent pendingIntent = PendingIntent.getService(this, 0, serviceIntent, 0);
+ long retryInterval = VisualVoicemailSettingsUtil.getVisualVoicemailRetryInterval(this,
+ phoneAccount);
+
+ Log.v(TAG, "Retrying "+ action + " in " + retryInterval + "ms");
+
+ AlarmManager alarmManager = (AlarmManager)
+ this.getSystemService(Context.ALARM_SERVICE);
+ alarmManager.set(AlarmManager.RTC, System.currentTimeMillis() + retryInterval,
+ pendingIntent);
+
+ VisualVoicemailSettingsUtil.setVisualVoicemailRetryInterval(this, phoneAccount,
+ retryInterval * 2);
+ }
+
+ private boolean upload(ImapHelper imapHelper) {
List<Voicemail> readVoicemails = mQueryHelper.getReadVoicemails();
List<Voicemail> deletedVoicemails = mQueryHelper.getDeletedVoicemails();
- if (deletedVoicemails != null &&
- imapHelper.markMessagesAsDeleted(deletedVoicemails)) {
- // We want to delete selectively instead of all the voicemails for this provider
- // in case the state changed since the IMAP query was completed.
- mQueryHelper.deleteFromDatabase(deletedVoicemails);
+ boolean success = true;
+
+ if (deletedVoicemails.size() > 0) {
+ if (imapHelper.markMessagesAsDeleted(deletedVoicemails)) {
+ // We want to delete selectively instead of all the voicemails for this provider
+ // in case the state changed since the IMAP query was completed.
+ mQueryHelper.deleteFromDatabase(deletedVoicemails);
+ } else {
+ success = false;
+ }
}
- if (readVoicemails != null && imapHelper.markMessagesAsRead(readVoicemails)) {
- mQueryHelper.markReadInDatabase(readVoicemails);
+ if (readVoicemails.size() > 0) {
+ if (imapHelper.markMessagesAsRead(readVoicemails)) {
+ mQueryHelper.markReadInDatabase(readVoicemails);
+ } else {
+ success = false;
+ }
}
+
+ return success;
}
- private void download(ImapHelper imapHelper) {
+ private boolean download(ImapHelper imapHelper) {
List<Voicemail> serverVoicemails = imapHelper.fetchAllVoicemails();
List<Voicemail> localVoicemails = mQueryHelper.getAllVoicemails();
if (localVoicemails == null || serverVoicemails == null) {
// Null value means the query failed.
- return;
+ return false;
}
Map<String, Voicemail> remoteMap = buildMap(serverVoicemails);
@@ -206,6 +364,8 @@
for (Voicemail remoteVoicemail : remoteMap.values()) {
VoicemailContract.Voicemails.insert(this, remoteVoicemail);
}
+
+ return true;
}
/**
diff --git a/src/com/android/phone/vvm/omtp/sync/VoicemailProviderChangeReceiver.java b/src/com/android/phone/vvm/omtp/sync/VoicemailProviderChangeReceiver.java
index 0885d65..c2e6178 100644
--- a/src/com/android/phone/vvm/omtp/sync/VoicemailProviderChangeReceiver.java
+++ b/src/com/android/phone/vvm/omtp/sync/VoicemailProviderChangeReceiver.java
@@ -30,8 +30,8 @@
OmtpVvmSourceManager vvmSourceManager =
OmtpVvmSourceManager.getInstance(context);
if (vvmSourceManager.getOmtpVvmSources().size() > 0 && !isSelfChanged) {
- Intent serviceIntent = new Intent(context, OmtpVvmSyncService.class);
- serviceIntent.setAction(OmtpVvmSyncService.SYNC_UPLOAD_ONLY);
+ Intent serviceIntent = OmtpVvmSyncService.getSyncIntent(
+ context, OmtpVvmSyncService.SYNC_UPLOAD_ONLY, null, true /* firstAttempt */);
context.startService(serviceIntent);
}
}
diff --git a/src/com/android/phone/vvm/omtp/sync/VoicemailStatusQueryHelper.java b/src/com/android/phone/vvm/omtp/sync/VoicemailStatusQueryHelper.java
index fa87a59..66f3e9d 100644
--- a/src/com/android/phone/vvm/omtp/sync/VoicemailStatusQueryHelper.java
+++ b/src/com/android/phone/vvm/omtp/sync/VoicemailStatusQueryHelper.java
@@ -22,23 +22,23 @@
import android.provider.VoicemailContract;
import android.provider.VoicemailContract.Status;
import android.telecom.PhoneAccountHandle;
-import android.util.Log;
/**
* Construct queries to interact with the voicemail status table.
*/
public class VoicemailStatusQueryHelper {
- private static final String TAG = "VoicemailStatusQueryHelper";
final static String[] PROJECTION = new String[] {
Status._ID, // 0
- Status.NOTIFICATION_CHANNEL_STATE, // 1
- Status.SOURCE_PACKAGE // 2
+ Status.CONFIGURATION_STATE, // 1
+ Status.NOTIFICATION_CHANNEL_STATE, // 2
+ Status.SOURCE_PACKAGE // 3
};
public static final int _ID = 0;
- public static final int NOTIFICATION_CHANNEL_STATE = 1;
- public static final int SOURCE_PACKAGE = 2;
+ public static final int CONFIGURATION_STATE = 1;
+ public static final int NOTIFICATION_CHANNEL_STATE = 2;
+ public static final int SOURCE_PACKAGE = 3;
private Context mContext;
private ContentResolver mContentResolver;
@@ -51,12 +51,38 @@
}
/**
+ * Check if the configuration state for the voicemail source is "ok", meaning that the
+ * source is set up.
+ *
+ * @param phoneAccount The phone account for the voicemail source to check.
+ * @return {@code true} if the voicemail source is configured, {@code} false otherwise,
+ * including if the voicemail source is not registered in the table.
+ */
+ public boolean isVoicemailSourceConfigured(PhoneAccountHandle phoneAccount) {
+ return isFieldEqualTo(phoneAccount, CONFIGURATION_STATE, Status.CONFIGURATION_STATE_OK);
+ }
+
+ /**
* Check if the notifications channel of a voicemail source is active. That is, when a new
* voicemail is available, if the server able to notify the device.
*
* @return {@code true} if notifications channel is active, {@code false} otherwise.
*/
public boolean isNotificationsChannelActive(PhoneAccountHandle phoneAccount) {
+ return isFieldEqualTo(phoneAccount, NOTIFICATION_CHANNEL_STATE,
+ Status.NOTIFICATION_CHANNEL_STATE_OK);
+ }
+
+ /**
+ * Check if a field for an entry in the status table is equal to a specific value.
+ *
+ * @param phoneAccount The phone account of the voicemail source to query for.
+ * @param columnIndex The column index of the field in the returned query.
+ * @param value The value to compare against.
+ * @return {@code true} if the stored value is equal to the provided value. {@code false}
+ * otherwise.
+ */
+ private boolean isFieldEqualTo(PhoneAccountHandle phoneAccount, int columnIndex, int value) {
Cursor cursor = null;
if (phoneAccount != null) {
String phoneAccountComponentName = phoneAccount.getComponentName().flattenToString();
@@ -73,8 +99,7 @@
cursor = mContentResolver.query(
mSourceUri, PROJECTION, whereClause, whereArgs, null);
if (cursor != null && cursor.moveToFirst()) {
- return cursor.getInt(NOTIFICATION_CHANNEL_STATE) ==
- Status.NOTIFICATION_CHANNEL_STATE_OK;
+ return cursor.getInt(columnIndex) == value;
}
}
finally {
diff --git a/src/com/android/phone/vvm/omtp/sync/VoicemailsQueryHelper.java b/src/com/android/phone/vvm/omtp/sync/VoicemailsQueryHelper.java
index f45adf7..b86351c 100644
--- a/src/com/android/phone/vvm/omtp/sync/VoicemailsQueryHelper.java
+++ b/src/com/android/phone/vvm/omtp/sync/VoicemailsQueryHelper.java
@@ -104,7 +104,10 @@
while (cursor.moveToNext()) {
final long id = cursor.getLong(_ID);
final String sourceData = cursor.getString(SOURCE_DATA);
- Voicemail voicemail = Voicemail.createForUpdate(id, sourceData).build();
+ final boolean isRead = cursor.getInt(IS_READ) == 1;
+ Voicemail voicemail = Voicemail
+ .createForUpdate(id, sourceData)
+ .setIsRead(isRead).build();
voicemails.add(voicemail);
}
return voicemails;
@@ -172,7 +175,6 @@
mContentResolver.update(uri, contentValues, null, null);
}
-
/**
* Check if a particular voicemail has already been inserted. If not, insert the new voicemail.
* @param voicemail The voicemail to insert.
diff --git a/src/com/android/phone/vvm/omtp/sync/VvmPhoneStateListener.java b/src/com/android/phone/vvm/omtp/sync/VvmPhoneStateListener.java
deleted file mode 100644
index c7c1116..0000000
--- a/src/com/android/phone/vvm/omtp/sync/VvmPhoneStateListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.phone.vvm.omtp.sync;
-
-import android.content.Context;
-import android.provider.VoicemailContract;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.PhoneStateListener;
-import android.telephony.ServiceState;
-
-import com.android.phone.PhoneUtils;
-
-/**
- * Check if service is lost and indicate this in the voicemail status.
- */
-public class VvmPhoneStateListener extends PhoneStateListener {
- private PhoneAccountHandle mPhoneAccount;
- private Context mContext;
- public VvmPhoneStateListener(Context context, PhoneAccountHandle accountHandle) {
- super(PhoneUtils.getSubIdForPhoneAccountHandle(accountHandle));
- mContext = context;
- mPhoneAccount = accountHandle;
- }
-
- @Override
- public void onServiceStateChanged(ServiceState serviceState) {
- if (serviceState.getState() == ServiceState.STATE_IN_SERVICE) {
- VoicemailContract.Status.setStatus(mContext, mPhoneAccount,
- VoicemailContract.Status.CONFIGURATION_STATE_OK,
- VoicemailContract.Status.DATA_CHANNEL_STATE_OK,
- VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_OK);
- } else {
- VoicemailContract.Status.setStatus(mContext, mPhoneAccount,
- VoicemailContract.Status.CONFIGURATION_STATE_OK,
- VoicemailContract.Status.DATA_CHANNEL_STATE_NO_CONNECTION,
- VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION);
- }
- }
-}
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index aaaf7db..4a92847 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -95,6 +95,7 @@
return DisconnectCause.RESTRICTED;
case android.telephony.DisconnectCause.CDMA_ACCESS_FAILURE:
+ case android.telephony.DisconnectCause.CDMA_ALREADY_ACTIVATED:
case android.telephony.DisconnectCause.CDMA_CALL_LOST:
case android.telephony.DisconnectCause.CDMA_DROP:
case android.telephony.DisconnectCause.CDMA_INTERCEPT:
@@ -230,6 +231,10 @@
resourceId = R.string.callFailed_cb_enabled;
break;
+ case android.telephony.DisconnectCause.CDMA_ALREADY_ACTIVATED:
+ resourceId = R.string.callFailed_cdma_activation;
+ break;
+
case android.telephony.DisconnectCause.FDN_BLOCKED:
resourceId = R.string.callFailed_fdn_only;
break;
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 38cb4a3..6c4f48e 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -234,7 +234,7 @@
setConferenceHost(conferenceHost);
int capabilities = Connection.CAPABILITY_SUPPORT_HOLD | Connection.CAPABILITY_HOLD |
- Connection.CAPABILITY_MUTE;
+ Connection.CAPABILITY_MUTE | Connection.CAPABILITY_CONFERENCE_HAS_NO_CHILDREN;
capabilities = applyVideoCapabilities(capabilities, mConferenceHost.getConnectionCapabilities());
setConnectionCapabilities(capabilities);
@@ -451,21 +451,28 @@
* Updates the manage conference capability of the conference. Where there are one or more
* conference event package participants, the conference management is permitted. Where there
* are no conference event package participants, conference management is not permitted.
+ * <p>
+ * Note: We add and remove {@link Connection#CAPABILITY_CONFERENCE_HAS_NO_CHILDREN} to ensure
+ * that the conference is represented appropriately on Bluetooth devices.
*/
private void updateManageConference() {
boolean couldManageConference = can(Connection.CAPABILITY_MANAGE_CONFERENCE);
boolean canManageConference = !mConferenceParticipantConnections.isEmpty();
- Log.v(this, "updateManageConference was:%s is:%s", couldManageConference ? "Y" : "N",
+ Log.v(this, "updateManageConference was :%s is:%s", couldManageConference ? "Y" : "N",
canManageConference ? "Y" : "N");
if (couldManageConference != canManageConference) {
- int newCapabilities = getConnectionCapabilities();
+ int capabilities = getConnectionCapabilities();
if (canManageConference) {
- addCapability(Connection.CAPABILITY_MANAGE_CONFERENCE);
+ capabilities |= Connection.CAPABILITY_MANAGE_CONFERENCE;
+ capabilities &= ~Connection.CAPABILITY_CONFERENCE_HAS_NO_CHILDREN;
} else {
- removeCapability(Connection.CAPABILITY_MANAGE_CONFERENCE);
+ capabilities &= ~Connection.CAPABILITY_MANAGE_CONFERENCE;
+ capabilities |= Connection.CAPABILITY_CONFERENCE_HAS_NO_CHILDREN;
}
+
+ setConnectionCapabilities(capabilities);
}
}
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 135ad31..df458fd 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -27,9 +27,11 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.net.Uri;
+import android.os.PersistableBundle;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
@@ -41,6 +43,7 @@
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.PhoneProxy;
+import com.android.phone.PhoneGlobals;
import com.android.phone.PhoneUtils;
import com.android.phone.R;
@@ -231,10 +234,11 @@
configuration.mnc = subscriptionInfo.getMnc();
}
- // Load the MNC/MCC specific configuration.
- Context subContext = mContext.createConfigurationContext(configuration);
- mIsVideoPauseSupported = subContext.getResources().getBoolean(
- R.bool.support_pause_ims_video_calls);
+ // Check if IMS video pause is supported.
+ PersistableBundle b =
+ PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+ mIsVideoPauseSupported
+ = b.getBoolean(CarrierConfigManager.KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL);
}
/**
@@ -411,6 +415,30 @@
// Clean up any PhoneAccounts that are no longer relevant
cleanupPhoneAccounts();
+
+ // At some point, the phone account ID was switched from the subId to the iccId.
+ // If there is a default account, check if this is the case, and upgrade the default account
+ // from using the subId to iccId if so.
+ PhoneAccountHandle defaultPhoneAccount =
+ mTelecomManager.getUserSelectedOutgoingPhoneAccount();
+ ComponentName telephonyComponentName =
+ new ComponentName(mContext, TelephonyConnectionService.class);
+
+ if (defaultPhoneAccount != null &&
+ telephonyComponentName.equals(defaultPhoneAccount.getComponentName()) &&
+ !hasAccountEntryForPhoneAccount(defaultPhoneAccount)) {
+
+ String phoneAccountId = defaultPhoneAccount.getId();
+ if (!TextUtils.isEmpty(phoneAccountId) && TextUtils.isDigitsOnly(phoneAccountId)) {
+ PhoneAccountHandle upgradedPhoneAccount =
+ PhoneUtils.makePstnPhoneAccountHandle(
+ PhoneGlobals.getPhone(Integer.parseInt(phoneAccountId)));
+
+ if (hasAccountEntryForPhoneAccount(upgradedPhoneAccount)) {
+ mTelecomManager.setUserSelectedOutgoingPhoneAccount(upgradedPhoneAccount);
+ }
+ }
+ }
}
private void tearDownAccounts() {
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index a52418c..cbe7c0a 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -67,14 +67,21 @@
AsyncResult ar = (AsyncResult) msg.obj;
com.android.internal.telephony.Connection connection =
(com.android.internal.telephony.Connection) ar.result;
- if ((connection.getAddress() != null &&
- mOriginalConnection.getAddress() != null &&
+ if (mOriginalConnection != null) {
+ if (connection != null &&
+ ((connection.getAddress() != null &&
+ mOriginalConnection.getAddress() != null &&
mOriginalConnection.getAddress().contains(connection.getAddress())) ||
- connection.getStateBeforeHandover() == mOriginalConnection.getState()) {
- Log.d(TelephonyConnection.this, "SettingOriginalConnection " +
- mOriginalConnection.toString() + " with " + connection.toString());
- setOriginalConnection(connection);
- mWasImsConnection = false;
+ connection.getStateBeforeHandover() == mOriginalConnection.getState())) {
+ Log.d(TelephonyConnection.this,
+ "SettingOriginalConnection " + mOriginalConnection.toString()
+ + " with " + connection.toString());
+ setOriginalConnection(connection);
+ mWasImsConnection = false;
+ }
+ } else {
+ Log.w(TelephonyConnection.this,
+ "MSG_HANDOVER_STATE_CHANGED: mOriginalConnection==null - invalid state (not cleaned up)");
}
break;
case MSG_RINGBACK_TONE:
@@ -581,10 +588,14 @@
*/
void clearOriginalConnection() {
if (mOriginalConnection != null) {
- getPhone().unregisterForPreciseCallStateChanged(mHandler);
- getPhone().unregisterForRingbackTone(mHandler);
- getPhone().unregisterForHandoverStateChanged(mHandler);
- getPhone().unregisterForDisconnect(mHandler);
+ if (getPhone() != null) {
+ getPhone().unregisterForPreciseCallStateChanged(mHandler);
+ getPhone().unregisterForRingbackTone(mHandler);
+ getPhone().unregisterForHandoverStateChanged(mHandler);
+ getPhone().unregisterForDisconnect(mHandler);
+ }
+ mOriginalConnection.removePostDialListener(mPostDialListener);
+ mOriginalConnection.removeListener(mOriginalConnectionListener);
mOriginalConnection = null;
}
}
@@ -724,7 +735,8 @@
break;
case DISCONNECTED:
setDisconnected(DisconnectCauseUtil.toTelecomDisconnectCause(
- mOriginalConnection.getDisconnectCause()));
+ mOriginalConnection.getDisconnectCause(),
+ mOriginalConnection.getVendorDisconnectCause()));
close();
break;
case DISCONNECTING:
@@ -808,12 +820,7 @@
private void close() {
Log.v(this, "close");
- if (getPhone() != null) {
- getPhone().unregisterForPreciseCallStateChanged(mHandler);
- getPhone().unregisterForRingbackTone(mHandler);
- getPhone().unregisterForHandoverStateChanged(mHandler);
- }
- mOriginalConnection = null;
+ clearOriginalConnection();
destroy();
}
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 7826ce0..5848135 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -27,6 +27,7 @@
import android.telecom.ConnectionService;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
+import android.telephony.CarrierConfigManager;
import android.telephony.PhoneNumberUtils;
import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
@@ -152,48 +153,25 @@
// Obtain the configuration for the outgoing phone's SIM. If the outgoing number
// matches the *228 regex pattern, fail the call. This number is used for OTASP, and
// when dialed could lock LTE SIMs to 3G if not prohibited..
- SubscriptionManager subManager = SubscriptionManager.from(phone.getContext());
- SubscriptionInfo subInfo = subManager.getActiveSubscriptionInfo(phone.getSubId());
- if (subInfo != null) {
- Configuration config = new Configuration();
- config.mcc = subInfo.getMcc();
- config.mnc = subInfo.getMnc();
- Context subContext = phone.getContext().createConfigurationContext(config);
+ boolean disableActivation = false;
+ CarrierConfigManager cfgManager = (CarrierConfigManager)
+ phone.getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);
+ if (cfgManager != null) {
+ disableActivation = cfgManager.getConfigForSubId(phone.getSubId())
+ .getBoolean(CarrierConfigManager.KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL);
+ }
- // Get the resources specific to the subscription in question.
- Resources res = subContext.getResources();
- if (res != null) {
- boolean disableActivation = false;
- String configValue =
- res.getString(R.string.config_disable_cdma_activation_code);
-
- // Set disableActivation based on the configuration value.
- if (!TextUtils.isEmpty(configValue)) {
- String [] valueArray = configValue.split(";");
-
- if (valueArray.length == 1) {
- // If the configuration says just "true" disable it.
- disableActivation = valueArray[0].equalsIgnoreCase("true");
- } else if (valueArray.length == 2) {
- // If the configuration is split by a semicolon, make sure the
- // second half is equal to the group ID for the phone.
- disableActivation = valueArray[0].equalsIgnoreCase("true") &&
- valueArray[1].equalsIgnoreCase(phone.getGroupIdLevel1());
- }
- }
-
- if (disableActivation) {
- return Connection.createFailedConnection(
- DisconnectCauseUtil.toTelecomDisconnectCause(
- android.telephony.DisconnectCause.INVALID_NUMBER,
- "Tried to dial *228"));
- }
- }
+ if (disableActivation) {
+ return Connection.createFailedConnection(
+ DisconnectCauseUtil.toTelecomDisconnectCause(
+ android.telephony.DisconnectCause
+ .CDMA_ALREADY_ACTIVATED,
+ "Tried to dial *228"));
}
}
}
- boolean isEmergencyNumber = PhoneNumberUtils.isPotentialEmergencyNumber(number);
+ boolean isEmergencyNumber = PhoneNumberUtils.isLocalEmergencyNumber(this, number);
// Get the right phone object from the account data passed in.
final Phone phone = getPhoneForAccount(request.getAccountHandle(), isEmergencyNumber);
@@ -293,7 +271,8 @@
if (phone == null) {
return Connection.createFailedConnection(
DisconnectCauseUtil.toTelecomDisconnectCause(
- android.telephony.DisconnectCause.ERROR_UNSPECIFIED));
+ android.telephony.DisconnectCause.ERROR_UNSPECIFIED,
+ "Phone is null"));
}
Call call = phone.getRingingCall();
@@ -332,7 +311,8 @@
if (phone == null) {
return Connection.createFailedConnection(
DisconnectCauseUtil.toTelecomDisconnectCause(
- android.telephony.DisconnectCause.ERROR_UNSPECIFIED));
+ android.telephony.DisconnectCause.ERROR_UNSPECIFIED,
+ "Phone is null"));
}
final List<com.android.internal.telephony.Connection> allConnections = new ArrayList<>();
@@ -391,7 +371,8 @@
com.android.internal.telephony.Connection originalConnection;
try {
- originalConnection = phone.dial(number, request.getVideoState());
+ originalConnection =
+ phone.dial(number, null, request.getVideoState(), request.getExtras());
} catch (CallStateException e) {
Log.e(this, e, "placeOutgoingConnection, phone.dial exception: " + e);
int cause = android.telephony.DisconnectCause.OUTGOING_FAILURE;
@@ -565,6 +546,8 @@
Log.d(this, "Adding CDMA connection to conference controller: " + connection);
mCdmaConferenceController.add((CdmaConnection)connection);
}
+ Log.d(this, "Removing connection from IMS conference controller: " + connection);
+ mImsConferenceController.remove(connection);
}
}
}