Merge "Phone app might use cleartext network traffic." into mnc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1b50802..8e3638a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -39,6 +39,13 @@
     <protected-broadcast android:name="android.provider.Telephony.SIM_FULL" />
     <protected-broadcast android:name="com.android.internal.telephony.data-restart-trysetup" />
     <protected-broadcast android:name="com.android.internal.telephony.data-stall" />
+    <protected-broadcast android:name="android.intent.action.DATA_SMS_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_DELIVER" />
+    <protected-broadcast android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
+    <protected-broadcast android:name="android.provider.Telephony.WAP_PUSH_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_CB_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_EMERGENCY_CB_RECEIVED" />
 
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
@@ -562,12 +569,6 @@
                 android:theme="@style/Empty">
         </activity>
 
-        <activity android:name=".TextMessagePackageChooser"
-                android:label="@string/respond_via_sms_setting_title"
-                android:configChanges="orientation|screenSize|keyboardHidden"
-                android:theme="@style/Theme.Transparent">
-        </activity>
-
         <activity android:name="HfaActivity"
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:launchMode="singleInstance"
@@ -634,25 +635,6 @@
                 <data android:scheme="sms" />
             </intent-filter>
         </receiver>
-        <service
-            android:name="com.android.phone.vvm.omtp.sync.OmtpVvmSyncService"
-            android:exported="true"
-            android:process=":sync">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter"/>
-            </intent-filter>
-            <meta-data android:name="android.content.SyncAdapter"
-                    android:resource="@xml/syncadapter" />
-        </service>
-        <service
-            android:name="android.telecom.AuthenticatorService">
-            <intent-filter>
-                <action android:name="android.accounts.AccountAuthenticator"/>
-            </intent-filter>
-            <meta-data
-                android:name="android.accounts.AccountAuthenticator"
-                android:resource="@xml/authenticator" />
-       </service>
        <receiver android:name="com.android.phone.vvm.omtp.SimChangeReceiver"
             android:exported="true">
             <intent-filter>
@@ -671,5 +653,27 @@
                    android:mimeType="vnd.android.cursor.item/voicemail" />
           </intent-filter>
        </receiver>
+       <receiver
+           android:name="com.android.phone.vvm.omtp.sync.VoicemailProviderChangeReceiver"
+           android:exported="true">
+           <intent-filter>
+              <action android:name="android.intent.action.PROVIDER_CHANGED" />
+               <data
+                   android:scheme="content"
+                   android:host="com.android.voicemail"
+                   android:mimeType="vnd.android.cursor.dir/voicemails"/>
+          </intent-filter>
+       </receiver>
+       <service
+            android:name="com.android.phone.vvm.omtp.sync.OmtpVvmSyncService"
+            android:exported="false"
+       />
+       <receiver android:name="com.android.phone.vvm.omtp.VvmPackageInstallReceiver">
+          <intent-filter>
+              <action android:name="android.intent.action.PACKAGE_INSTALL" />
+              <action android:name="android.intent.action.PACKAGE_ADDED" />
+              <data android:scheme="package"/>
+          </intent-filter>
+       </receiver>
     </application>
 </manifest>
diff --git a/res/drawable-hdpi/ic_add_24dp.png b/res/drawable-hdpi/ic_add_24dp.png
new file mode 100644
index 0000000..694179b
--- /dev/null
+++ b/res/drawable-hdpi/ic_add_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_add_24dp.png b/res/drawable-mdpi/ic_add_24dp.png
new file mode 100644
index 0000000..3856041
--- /dev/null
+++ b/res/drawable-mdpi/ic_add_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_add_24dp.png b/res/drawable-xhdpi/ic_add_24dp.png
new file mode 100644
index 0000000..67bb598
--- /dev/null
+++ b/res/drawable-xhdpi/ic_add_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_add_24dp.png b/res/drawable-xxhdpi/ic_add_24dp.png
new file mode 100644
index 0000000..0fdced8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_add_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_add_24dp.png b/res/drawable-xxxhdpi/ic_add_24dp.png
new file mode 100644
index 0000000..d64c22e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_add_24dp.png
Binary files differ
diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index acb7033..01c2f80 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -121,8 +121,9 @@
 
         <ImageButton
             android:id="@+id/floating_action_button"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:background="@drawable/floating_action_button"
             android:contentDescription="@string/description_dial_button"
             android:src="@drawable/fab_ic_call"/>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d37aa82..69ac285 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Foonrekeninge"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Voeg SIP-rekening by"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Stel rekeninginstellings op"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Alle oproeprekeninge"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Kies watter rekeninge oproepe kan maak"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-oproepe"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Moenie Wi-Fi vir oproepe gebruik nie"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Moenie belassistent gebruik nie"</string>
@@ -416,6 +418,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanent geblokkeer."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Jy het <xliff:g id="NUMBER">%d</xliff:g> oorblywende pogings."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 is nie meer geblokkeer nie"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Netwerk- of SIM-kaartfout"</string>
     <string name="doneButton" msgid="2859593360997984240">"Klaar"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Stemboodskapnommer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Bel"</string>
@@ -426,23 +429,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Hou aan"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lui af"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"In oproep"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Bel"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Gemiste oproep"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepe"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> gemiste oproepe"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Gemiste oproep van <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Oproep aan die gang"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Hou aan"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Inkomende oproep"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuwe stemboodskap"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nuwe stemboodskap (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Bel <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Stemboodskapnommer onbekend"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Geen diens nie"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Gekose netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie beskikbaar nie"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Lui af"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Bel terug"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Boodskap"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Skakel vliegtuigmodus af om \'n oproep te maak."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Skakel vliegtuigmodus af of koppel aan \'n draadlose netwerk om \'n oproep te maak."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nie geregistreer op netwerk nie."</string>
@@ -549,6 +541,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"bel"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreer"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreer"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Klank"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Luitoon en vibreer"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ingeboude SIM-kaarte"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 10cbf50..f977b1a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"የትኛዎቹ መለያዎች ጥሪዎችን ማድረግ እንደሚችሉ ይምረጡ"</string>
     <string name="wifi_calling" msgid="739018212480165598">"የWi-Fi ጥሪ ማድረጊያ"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"የWi-Fi መደወያን አትጠቀም"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"የጥሪ ረዳትን አትጠቀም"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"ፒን2 በቋሚነት ታግዷል።"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"እርስዎ <xliff:g id="NUMBER">%d</xliff:g> ቀሪ ሙከራዎች አልዎት።"</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ከአሁን በኋላ አልታገደም"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"የአውታረ መረብ ወይም የሲም ካርድ ስህተት"</string>
     <string name="doneButton" msgid="2859593360997984240">"ተከናውኗል"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"የድምፅ መልዕክት ቁጥር"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"በመደወል ላይ"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"በመደወል ላይ"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"ያመለጠጥሪ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ያመለጡ ጥሪዎች"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ያመለጡ ጥሪዎች"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"ከ<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ያመለጠ ጥሪ"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"እየተካሄደ ያለ ጥሪ"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"ያዝናቆይ"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"ገቢ ጥሪ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"አዲስ የድምፅ መልዕክት"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"አዲስ የድምፅ መልዕክት<xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"ደውል <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"ዝጋ"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"መልሰህ ደውል"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"መልዕክት"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ጥሪ ለማድረግ የአውሮፕላን ሁነታን ያጥፉ።"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ጥሪ ለማድረግ የአውሮፕላን ሁኔታን ያጥፉ ወይም ወደ ሽቦ አልባ አውታረ መረብ ያገናኙ።"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"በአውታረ መረቡ ላይ አልተመዘገበም።"</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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">"አብሮገነብ ሲም ካርዶች"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8622a25..ce79703 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"حدد الحسابات التي يمكنها إجراء مكالمات"</string>
     <string name="wifi_calling" msgid="739018212480165598">"‏الاتصال عبر Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"‏عدم استخدام الاتصال عبر Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"عدم استخدام مساعد الاتصال"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"‏تم حظر PUK2 بشكل دائم."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"يتبقى لديك <xliff:g id="NUMBER">%d</xliff:g> من المحاولات."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"طلب"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"جارٍ الطلب"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"مكالمة فائتة"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"المكالمات الفائتة"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> من المكالمات الفائتة"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"مكالمة فائتة من <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"مكالمة حالية"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"معلقة"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"مكالمة واردة"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"بريد صوتي جديد"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"بريد صوتي جديد (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"طلب <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"قطع الاتصال"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"معاودة الاتصال"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"رسالة"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"عليك إيقاف وضع الطائرة لإجراء مكالمة."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"عليك إيقاف وضع الطائرة أو الاتصال بشبكة لاسلكية لإجراء مكالمة."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"غير مسجل على الشبكة."</string>
@@ -557,6 +549,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_notification_ringtone_title" msgid="2609519527849101590">"الصوت"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"نغمة الرنين والاهتزاز"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"‏بطاقات SIM مدمجة"</string>
diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az-rAZ/arrays.xml
new file mode 100644
index 0000000..d2fdcd3
--- /dev/null
+++ b/res/values-az-rAZ/arrays.xml
@@ -0,0 +1,30 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="preferred_network_mode_choices_world_mode">
+    <item msgid="3391522821603584785">"Qlobal"</item>
+    <item msgid="6753774959494729275">"LTE / CDMA"</item>
+    <item msgid="8658695584186942227">"LTE / GSM / UMTS"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_values_world_mode">
+    <item msgid="8390941159766263625">"10"</item>
+    <item msgid="6103348346295810336">"8"</item>
+    <item msgid="3494519853214024879">"9"</item>
+  </string-array>
+</resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index 1b146b9..3ccd395 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -16,14 +16,14 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Mobil Data"</string>
+    <string name="phoneAppLabel" product="tablet" msgid="1107073389495104784">"Mobil məlumatlar"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Təcili Nömrəyığan"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"FDN siyahısı"</string>
     <string name="unknown" msgid="6878797917991465859">"Naməlum"</string>
     <string name="private_num" msgid="6713286113000232309">"Şəxsi nömrə"</string>
-    <string name="payphone" msgid="1931775086311769314">"Telefon ödənişi"</string>
+    <string name="payphone" msgid="4793877574636445118">"Taksofon"</string>
     <string name="onHold" msgid="9035493194749959955">"Gözləmə mövqeyində"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI kodu başlandı"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD kod işləyir..."</string>
@@ -52,15 +52,43 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Şəbəkə kilidinin açılması tələbi göndərilir…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Şəbəkəni kiliddən çıxarmaq sorğusu uğursuzdur."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Şəbəkə uğurla kiliddən çıxarıldı."</string>
+    <string name="mobile_network_settings_not_available" msgid="3831911315358856062">"Mobil şəbəkə ayarları bu istifadəçi üçün əlçatan deyil"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM zəng parametrləri"</string>
+    <string name="labelGsmMore_with_label" msgid="2674012918829238901">"GSM zəng ayarları (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA zəng parametrləri"</string>
+    <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"CDMA zəng ayarları (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Çatma Nöqtəsi Adları"</string>
     <string name="settings_label" msgid="3876743539816984008">"Şəbəkə ayarları"</string>
+    <string name="phone_accounts" msgid="6376603393888116364">"Hesabların çağrılması"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Zənglər et"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"SIP zəngləri et"</string>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Əvvəlcə soruş"</string>
+    <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Parametrlər"</string>
+    <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Hesabları seç"</string>
+    <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefon hesabları"</string>
+    <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP hesabı əlavə et"</string>
+    <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Hesab parametrlərini konfiqurasiya et"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Bütün çağrı hesabları"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Hansı hesabların zəng edə biləcəyini seçin"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi zəngi"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi zəngindən istifadə etmə"</string>
+    <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Zəng köməkçisindən istifadə etmə"</string>
+    <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Yoxdur"</string>
+    <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Zəng köməkçisi"</string>
+    <string name="wifi_calling_use_call_assistant" msgid="8460024827012666199">"Zəng köməkçisindən istifadə edin"</string>
+    <string name="wifi_calling_select_call_assistant" msgid="9296558058772293">"Zəng köməkçisini seç"</string>
+    <string name="wifi_calling_select_call_assistant_summary" msgid="164985727137156474">"Bunlara olan zənglər üçün şəbəkələri idarə edin:"</string>
+    <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Proqramlar və ya xidmətlərə zənglər üçün istifadə olunan şəbəkələri idarə etmək imkanı verin"</string>
+    <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfiqurasiya et"</string>
+    <string name="connection_service_default_label" msgid="1498481943805913754">"Daxili bağlantı xidməti"</string>
     <string name="voicemail" msgid="8693759337917898954">"Səsli poçt"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Səsli məktub (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"SP:"</string>
     <string name="networks" msgid="8873030692174541976">"Şəbəkə operatorları"</string>
+    <string name="cell_broadcast_settings" msgid="8740238216690502563">"Təcili yayımlar"</string>
     <string name="call_settings" msgid="6112441768261754562">"Zəng parametrləri"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Əlavə parametrlər"</string>
+    <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Əlavə parametrlər (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Əlavə GSM yalnız zəng parametrləri"</string>
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Əlavə CDMA zəng parametrləri"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Əlavə CDMA yalnız Zəng ayarları"</string>
@@ -74,29 +102,32 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Zəng zamanı məni gələn zənglərdən xəbərdar et"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Zəng zamanı məni gələn zənglərdən xəbərdar et"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Zəng yönləndirmə parametrləri"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Zəngin yönləndirilməsi parametrləri (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Zəng yönləndirmə"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Həmişə yönləndirin"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Həmişə bu nömrəni işlədin"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Bütün zənglər yönləndirilir"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Bütün zənglər <xliff:g id="PHONENUMBER">{0}</xliff:g> nömrəsinə yönləndirilir"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nömrə əlçatmazdır"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Deaktiv"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Məşğul olarkən yönləndirin"</string>
+    <string name="sum_cfu_disabled" msgid="8384177689501334080">"Qeyri-aktiv"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Məşğul olduqda"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Məşğul olarkən yönləndiriləcək nömrə"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> nömrəsinə yönləndirilir"</string>
-    <string name="sum_cfb_disabled" msgid="227440009979537651">"Deaktiv"</string>
+    <string name="sum_cfb_disabled" msgid="4913145177320506827">"Qeyri-aktiv"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Sizin mobil operator telefon məşğul olduğu zaman zəng yönləndirməni deaktiv etməyi  dəstəkləmir."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Cavab verilməyən zaman yönləndirin"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Cavab vermədikdə"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Cavabsız olarkən yönləndiriləcək nömrə"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> nömrəsinə yönləndirilir"</string>
-    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Deaktiv"</string>
+    <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Qeyri-aktiv"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Sizin mobil daşıyıcı telefona cavab verilmədiyi zaman zəng yönləndirməni deaktiv etməyi dəstəkləmir."</string>
-    <string name="labelCFNRc" msgid="47183615370850000">"Əlçatmaz olarkən yönləndirin"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Zəng çatmadıqda"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Əlçatmaz olarkən yönləndiriləcək nömrə"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> nömrəsinə yönləndirilir"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Deaktiv"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Sizin mobil daşıyıcı telefon əlçatmaz olduğu zaman zəng yönləndirməni deaktiv etməyi dəstəkləmir."</string>
     <string name="updating_title" msgid="6146755386174019046">"Zəng parametrləri"</string>
+    <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Zəng parametrləri yalnız əsas istifadəçi tərəfindən dəyişdirilə bilər."</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Zəng parametrləri (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Zəng parametrləri xətası"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Oxuma parametrləri ..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Ayarlar güncəlləşdirilir…"</string>
@@ -106,8 +137,8 @@
     <string name="fdn_check_failure" msgid="18200614306525434">"Telefonunuzun Sabit Yığım Nömrələri parametri aktivdir. Buna görə də zəng ilə bağlı bəzi özəlliklər işləmir."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Bu ayarlara baxmadan öncə radionu yandırın."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
-    <string name="enable" msgid="1059008390636773574">"Aktiv edin"</string>
-    <string name="disable" msgid="7274240979164762320">"Deaktiv et"</string>
+    <string name="enable" msgid="7248657275000173526">"Yandır"</string>
+    <string name="disable" msgid="4678348128118573672">"Söndür"</string>
     <string name="change_num" msgid="239476305819844391">"Güncəlləşdirin"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Defolt şəbəkə"</item>
@@ -120,8 +151,8 @@
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Hazırkı yönləndirmə nömrələri ayarları alınıb saxlana bilmədi.\nİstənilən halda yeni provayderinizə keçmək istəyirsiniz mi?"</string>
     <string name="no_change" msgid="3186040086622435212">"Heç bir dəyişiklik edilmədi."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Səsli poçt xidmətinizi seçin"</string>
-    <string name="voicemail_default" msgid="5902099213882352338">"Daşıyıcım"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Mobil şəbəkə parametrləri"</string>
+    <string name="voicemail_default" msgid="2001233554889016880">"Operatorunuz"</string>
+    <string name="mobile_networks" msgid="2843854043339307375">"Mobil şəbəkə ayarları"</string>
     <string name="label_available" msgid="1181658289009300430">"Əlçatımlı şəbəkələr"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Axtarılır..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Şəbəkə tapılmadı"</string>
@@ -136,9 +167,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Avtomatik seçin"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Tərcih olunmuş şəbəkəni avtomatik seçin"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Avtomatik qeydiyyat ..."</string>
-    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Şəbəkə Rejimi"</string>
+    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tərcih edilən şəbəkə növü"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Şəbəkə əməliyyat rejimini dəyişin"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Tərcih edilmiş şəbəkə rejimi"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tərcih edilən şəbəkə növü"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Tərcih edilmiş şəbəkə rejimi: WCDMA tərcih edilir"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Tərcih edilmiş şəbəkə rejimi: Yalnız GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Tərcih edilmiş şəbəkə rejimi: yalnız WCDMA"</string>
@@ -153,6 +184,8 @@
     <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="228702246343742853">"Tərcih edilmiş şəbəkə rejimi: CDMA+LTE/EVDO"</string>
     <string name="preferred_network_mode_global_summary" msgid="1633134285545730364">"Tərcih edilmiş şəbəkə rejimi: Qlobal"</string>
     <string name="preferred_network_mode_lte_wcdma_summary" msgid="9180775701594742750">"Tərcih edilmiş şəbəkə rejimi: LTE / WCDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="633315028976225026">"Seçilən şəbəkə rejimi: LTE / GSM / UMTS"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Tərcih edilmiş şəbəkə rejimi: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
     <item msgid="7886739962255042385">"LTE / WCDMA"</item>
     <item msgid="577652050447385699">"LTE"</item>
@@ -168,13 +201,16 @@
     <item msgid="1524224863879435516">"Yalnız GSM"</item>
     <item msgid="3817924849415716259">"GSM/WCDMA\'ya üstünlük verilib"</item>
   </string-array>
+    <string name="enhanced_4g_lte_mode_title" msgid="522191650223239171">"Təkmil 4G LTE Rejimi"</string>
+    <string name="enhanced_4g_lte_mode_summary" msgid="2332175070522125850">"Səs və digər kommunikasiyaları təkmilləşdirmək üçün LTE xidmətlərindən istifadə edin (tövsiyə olunur)"</string>
     <string name="data_enabled" msgid="5972538663568715366">"Data aktivdir"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Mobil şəbəkə üzərindən data girişini aktivləşdirin"</string>
+    <string name="data_enable_summary" msgid="2382798156640007971">"Data istifadəsinə icazə verin"</string>
     <string name="roaming" msgid="8871412572928323707">"Data rouminq"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Rouminq zamanı data xidmətlərinə qoşulun"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Rouminq zamanı data xidmətlərinə qoşulun"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Siz deaktiv edilmiş rouminq ilə daxili şəbəkəni tərk etdiyiniz üçün data bağlantısını itirdiniz."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Data rouminqinə icazə verilsin? Sizdən əlavə rouminq rüsumları alına bilər!"</string>
+    <string name="roaming_warning" msgid="1603164667540144353">"Sizə əhəmiyyətli xərclər tətbiq edilə bilər."</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Məlumat rominqinə icazə verilsin?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS Seçimlər"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA Seçimlər"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Data istifadəsi"</string>
@@ -187,7 +223,7 @@
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> maksimal aşılıb\nData göstəricisi <xliff:g id="USED_1">%2$d</xliff:g> Kb/saniyəyə qədər azalıb"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ dövr keçib\nNövbəti period <xliff:g id="USED_1">%2$d</xliff:g> gün ərzində başlayır (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Əgər data istifadə limiti aşılsa, data göstəricisi <xliff:g id="USED">%1$d</xliff:g> Kb/saniyəyə qədər azalır"</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"Karrierinizin mobil şəbəkə data istifadə siyasəti haqqında daha çox məlumat"</string>
+    <string name="throttle_help_subtext" msgid="3633091498168446044">"Operatorun mobil şəbəkə data istifadə siyasəti haqqında ətraflı məlumat"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Hücrə Yayımı"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Hücrə Yayım SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS Hücrə Yayımı aktivdir"</string>
@@ -275,8 +311,9 @@
     <string name="enable_disable_multi_category" msgid="626771003122899280">"Multi-kateqoriya"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"Multi-kateqoriya aktivdir"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"Multi-kateqoriya deaktivdir"</string>
-    <string name="prefer_2g" msgid="8442550937280449639">"Yalnız 2G şəbəkələri istifadə edin"</string>
-    <string name="prefer_2g_summary" msgid="1976491403210690759">"Enerjiyə qənaət edir"</string>
+    <string name="network_lte" msgid="7702681952521375754">"LTE (məsləhətlidir)"</string>
+    <string name="network_4G" msgid="2723512640529983138">"4G (məsləhətlidir)"</string>
+    <string name="network_global" msgid="1323190488685355309">"Qlobal"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistem seçin"</string>
     <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA rouminq rejimini dəyişin"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistem seçin"</string>
@@ -297,8 +334,11 @@
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Cihazı aktivləşdirin"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Data xidmətini quraşdırın"</string>
+    <string name="carrier_settings_title" msgid="9028166176523012300">"Operator ayarları"</string>
     <string name="fdn" msgid="7878832555095183202">"Sabit Yığım Nömrələri"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Sabit yığım nömrələri (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN siyahısı"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN siyahısı (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN aktivasiya"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Sabit Yığım Nömrələri aktivdir."</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Sabit Yığım Nömrələri deaktivdir"</string>
@@ -316,6 +356,7 @@
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY rejimi ayarlayın"</string>
     <string name="auto_retry_mode_title" msgid="4073265511427813322">"Avtomatik yenidən sınama"</string>
     <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Avtomatik yenidən sınama rejimini aktivləşdirin"</string>
+    <string name="tty_mode_not_allowed_video_call" msgid="3795846787901909176">"Video zəng zamanı TTY rejimini dəyişdirməyə icazə yoxdur"</string>
     <string name="menu_add" msgid="1882023737425114762">"Kontakt əlavə edin"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Kontakta düzəliş edin"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Kontaktı sil"</string>
@@ -335,10 +376,11 @@
     <string name="pin2_invalid" msgid="5470854099230755944">"Yanlış PIN daxil etdiyiniz üçün FDN güncəlləşdirilmədi."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN güncəlləşdirilmədi, çünki nömrə 20 rəqəmdən çox ola bilməz."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN güncəlləşdirilmədi. PIN2 yanlış idi və ya telefon nömrəsi rədd edildi."</string>
+    <string name="fdn_failed" msgid="540018079008319747">"FDN əməliyyatı aılnmadı."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM kart oxunur ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartınızda kontakt yoxdur."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"İmport üçün kontaktlar seçin"</string>
-    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"SIM kartdan kontaktları import etmək üçün, ilk olaraq Uçuş Rejimini söndürün."</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM kartdan kontaktları import etmək üçün təyyarə rejimini deaktiv edin."</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM PIN aktivləşdirin/deaktivləşdirin"</string>
     <string name="change_pin" msgid="9174186126330785343">"SIM PIN kodu dəyişin"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
@@ -348,75 +390,68 @@
     <string name="badPin" msgid="8955102849303984935">"Daxil etdiyiniz köhnə PIN kod yanlışdır. Yenidən sınayın."</string>
     <string name="mismatchPin" msgid="5923253370683071889">"Yazdığınız PIN\'lər üst-üstə düşmür. Yenidən sınayın."</string>
     <string name="invalidPin" msgid="5981171102258684792">"4-dən 8-ə qədər rəqəmi olan PIN yazın."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"SIM PIN deaktiv edin"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"SIM PIN Aktivləşdirin"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Xahiş edirik, gözləyin ..."</string>
-    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM PIN aktivdir."</string>
-    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN deaktivdir."</string>
-    <string name="pin_failed" msgid="2298841192582192277">"Daxil etdiyiniz PIN yanlış idi."</string>
-    <string name="pin_changed" msgid="4365538014588501049">"SIM PIN dəyişdirildi."</string>
-    <string name="puk_requested" msgid="3898394204193202803">"Parol yanlışdır, SIM kilidlənib! PUK2 tələb olunur."</string>
+    <string name="disable_sim_pin" msgid="3419351358300716472">"SIM PIN-i təmizlə"</string>
+    <string name="enable_sim_pin" msgid="4845145659651484248">"SIM PIN-in qurulması"</string>
+    <string name="enable_in_progress" msgid="3417917024688497010">"PIN qurulur…"</string>
+    <string name="enable_pin_ok" msgid="2918545971413270063">"PIN qurulub"</string>
+    <string name="disable_pin_ok" msgid="2109571368635883688">"PIN təmizləndi"</string>
+    <string name="pin_failed" msgid="5644377896213584760">"PIN səhvdir"</string>
+    <string name="pin_changed" msgid="4455736268023261662">"PIN yenilənib"</string>
+    <string name="puk_requested" msgid="5921393215789090200">"Parol səhvdir. PIN indi bloklanıb. PUK sorğulanıb."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Köhnə PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Yeni PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Yeni PIN2 təsdiq edin"</string>
-    <string name="badPuk2" msgid="4851734468010000418">"Daxil edilmiş PUK2 kodu yanlışdır. Lütfən, yenidən sınayın."</string>
-    <string name="badPin2" msgid="1041576234483629991">"Köhnə PIN2 doğru deyil. Lütfən, yenidən sınayın."</string>
-    <string name="mismatchPin2" msgid="523029155918113440">"Yazdığınız PIN2 kodları üst-üstə düşmür. Yenidən sınayın."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"4-dən 8-ə qədər rəqəmi olan PIN2 yazın."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"8 rəqəmli PUK2 yazın."</string>
-    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 uğurla dəyişdirildi."</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 kodu yazın"</string>
-    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Parol yanlışdır. PIN2 kodunu dəyişib təkrarlayın!"</string>
-    <string name="puk2_requested" msgid="8909278021238716877">"Parol yanlışdır, SIM kilidlənib. PUK2 tələb olunur."</string>
+    <string name="badPuk2" msgid="7910064009531541708">"PUK2 səhvdir. Yenidən cəhd edin."</string>
+    <string name="badPin2" msgid="6646896629970023109">"Köhnə PIN2 səhvdir. Yenidən cəhd edin."</string>
+    <string name="mismatchPin2" msgid="4177967478551851117">"PIN2-lər uyğun gəlmir. Yenidən cəhd edin."</string>
+    <string name="invalidPin2" msgid="1757045131429105595">"4-8 rəqəmli PIN2-ni daxil edin."</string>
+    <string name="invalidPuk2" msgid="7059081153334815973">"8 rəqəmli PUK2-ni daxil edin."</string>
+    <string name="pin2_changed" msgid="3724522579945610956">"PIN2 yenilənib"</string>
+    <string name="label_puk2_code" msgid="4688069961795341948">"PUK2 kodunu daxil et"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Parol səhvdir. PIN2 indi Bloklanıb. Yenidən cəhd etmək üçün PIN 2-ni dəyişdirin."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Parol səhvdir. SIM indi kilidlənib. PUK2-ni daxil et."</string>
+    <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 həmişəlik qapadıldı."</string>
+    <string name="pin2_attempts" msgid="720736232885011507">\n"Sizin <xliff:g id="NUMBER">%d</xliff:g> cəhdiniz qalıb."</string>
+    <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 artıq bloklanmayıb"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Şəbəkə və ya SIM kart xətası"</string>
     <string name="doneButton" msgid="2859593360997984240">"Tamam"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Konfrans zəngi <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Səsli poçt nömrəsi"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Nömrə yığılır"</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Yenidən sınanılır"</string>
+    <string name="card_title_redialing" msgid="8253487008234167266">"Yenidən yığır"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konfrans zəngi"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Gələn zəng"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Zəng sona çatdı"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Gözləmədədir"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Dəstək asılır"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"zəngdadır"</string>
-    <string name="card_title_my_phone_number" msgid="112428362494434191">"Mənim nömrəm <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Nömrə yığılır"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Buraxılmış zəng"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Buraxılmış zənglər"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> buraxılmış zənglər"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> tərəfindən zəng buraxılıb"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Davam edən zəng"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Gözləmə mövqeyində"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Zəng gəlir"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Yeni səsli poçt"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Yeni səsli poçt (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Yığın <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Səsli poçt nömrəsi naməlumdur"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Xidmət yoxdur"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Seçilmiş (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) şəbəkə əlçatmazdır"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Dəstəyi qoyun"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Geriyə zəng"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesaj"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Zəng etmək üçün ilk olaraq Uçuş Rejimini söndürün."</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Zəng etmək üçün təyyarə rejimini deaktiv edin."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Zəng etmək üçün təyyarə rejimini deaktiv edin və ya Wi-Fi şəbəkəsinə qoşulun."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Şəbəkədə qeydə alınmayıb."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobil şəbəkə əlçatımlı deyil."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Zəng göndərilmədi, etibarlı nömrə daxil edilməyib."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Zəng göndərilmədi."</string>
+    <string name="incall_error_out_of_service" msgid="4100065333878929223">"Mobil şəbəkə əlçatan deyil"</string>
+    <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Mobil şəbəkə əlçatmazdır. Zəng etmək üçün Wi-Fi şəbəkəsinə qoşulun."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="1150414018684246528">"Zəngi yerləşdirmək üçün düzgün nömrə daxil edin."</string>
+    <string name="incall_error_call_failed" msgid="6302746943230078197">"Zəng etmək mümkün deyil."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI başlanma ardıcıllığı…"</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Dəstəklənməyən xidmət."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Zəngləri keçirmək mümkün deyil."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Zəngi ayırmaq mümkün deyil."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Zəng transfer oluna bilmir."</string>
+    <string name="incall_error_supp_service_unknown" msgid="655570339115407698">"Xidmət dəstəklənmir"</string>
+    <string name="incall_error_supp_service_switch" msgid="5237002176899962862">"Zəngləri keçirmək mümkün deyil."</string>
+    <string name="incall_error_supp_service_separate" msgid="7224393405134545246">"Zəngi ayırmaq mümkün deyil."</string>
+    <string name="incall_error_supp_service_transfer" msgid="7235952238189391438">"Ötürmək mümkün deyil."</string>
     <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Zənglərin konfransı mümkün deyil."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Zəngi rədd etmək mümkün deyil."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Zəng(ləri) buraxmaq mümkün deyil."</string>
-    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"İnternet zəng"</string>
+    <string name="incall_error_supp_service_reject" msgid="8998568661508655638">"Zəngi rədd etmək mümkün deyil."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7434513517153834426">"Zəngləri buraxmaq mümkün deyil."</string>
+    <string name="incall_error_wfc_only_no_wireless_network" msgid="1782466780452640089">"Zəng etmək üçün Wi-Fi şəbəkəsinə qoşulun."</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Təcili zəng"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio yandırılır ..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Xidmət sahəsindən kənardadır, yenidən sınanılır…"</string>
-    <string name="dial_emergency_error" msgid="7969515493359619960">"Zəng göndərilmədi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> təcili nömrə deyil!"</string>
-    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Zəng göndərilmədi. Təcili nömrəyə zəng vurun!"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Xidmət yoxdur. Yenidən cəhd edilir…"</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"Zəng etmək mümkün deyil. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> fövqəladə nömrə deyil."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"Zəng etmək mümkün deyil. Fövqəladə nömrəni yığ."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Yığmaq üçün klaviatura istifadə edin"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Saxlayın"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Son"</string>
@@ -447,13 +482,12 @@
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Uzun"</item>
   </string-array>
-    <string name="network_message" msgid="4483886461245213802">"Şəbəkə mesajı"</string>
+    <string name="network_info_message" msgid="7738596060242881930">"Şəbəkə mesajı"</string>
+    <string name="network_error_message" msgid="3394780436230411413">"Səhv mesajı"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Telefonunuzu aktivləşdirin"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefon xidmətinizi aktivləşdirmək üçün xüsusi zəngə ehtiyac var.\n\n\"Aktivləşdir\" düyməsini basandan sonra telefonunuzu aktivləşdirmək üçün təqdim olunan instruksiyaları dinləyin."</string>
-    <!-- no translation found for ota_hfa_activation_title (2234246934160473981) -->
-    <skip />
-    <!-- no translation found for ota_hfa_activation_dialog_message (8092479227918463415) -->
-    <skip />
+    <string name="ota_hfa_activation_title" msgid="2234246934160473981">"Aktivləşdirilir..."</string>
+    <string name="ota_hfa_activation_dialog_message" msgid="8092479227918463415">"Telefon Sizin mobil data xidmətinizi aktivləşdirir. \n \n Bu 5 dəqiqə çəkə bilər."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Aktivasiyanı ötürək?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Aktivasiyanı ötürdüyünüz halda zəng edə və ya mobil data şəbəkəsinə birləşə bilməzsiniz (Wi-Fi şəbəkəsinə birləşə bilərsiniz). Telefonunuzu aktivləşdirənə kimi hər dəfə telefonunuzu yandırarkən Sizə onu aktivləşdirmək təklif olunacaq."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ötürün"</string>
@@ -462,8 +496,8 @@
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Aktivasiya problemi"</string>
     <string name="ota_listen" msgid="162923839877584937">"Aktivasiyanın tamamlanmasını eşidənə kimi səslənmiş təlimatlara əməl edin."</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Dinamik"</string>
-    <string name="ota_progress" msgid="3420314892609254729">"Telefonunuz proqramlaşana qədər gözləyin."</string>
-    <string name="ota_failure" msgid="4311299546379674378">"Proqramlaşdırma Uğursuz Oldu"</string>
+    <string name="ota_progress" msgid="460876637828044519">"Telefonunuz proqramlaşdırılır ..."</string>
+    <string name="ota_failure" msgid="7713756181204620397">"Telefonunuzu proqramlaşdırmaq mümkün olmadı"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefonunuz artıq aktivləşdirildi. Xidmətin başlanması üçün 15 dəqiqə lazım ola bilər."</string>
     <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefonunuz aktivləşdirilmədi. \nDaha yaxşı şəbəkə əhatəsi olan ərazidə olmağınız gərəkdir (misal üçün, pəncərənin yanında, çöldə). \n\nYenidən cəhd edin və ya daha çox seçənək üçün müştəri xidmətlərinə zəng vurun."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"AŞIRI SPC XƏTALAR"</string>
@@ -474,18 +508,18 @@
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Təcili Geriyə Zəng Rejimi Daxil Edildi"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Təcisi Geriyə Zəng Rejimi"</string>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Data bağlantısı deaktiv edildi"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"<xliff:g id="COUNT">%s</xliff:g> dəqiqəlik heç bir data bağlantısı yoxdur"</item>
-    <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g> dəqiqə ərzində heç bir data bağlantısı yoxdur."</item>
-  </plurals>
-  <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="8060210887681426682">"Telefon <xliff:g id="COUNT">%s</xliff:g> dəqiqəlik Təcili Geriyə Zəng rejimində olacaq. Bu rejimdə data bağlantısı işlədən heç bir tətbiq istifadə oluna bilməz. İndi çıxmaq istəyirsiniz?"</item>
-    <item quantity="other" msgid="8617116564023933114">"Telefon <xliff:g id="COUNT">%s</xliff:g> dəqiqəlik Təcili Geriyə Zəng rejimində olacaq. Bu rejimdə data bağlantısı işlədən heç bir tətbiq istifadə oluna bilməz. İndi çıxmaq istəyirsiniz?"</item>
-  </plurals>
-  <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="2585506997024726599">"Seçilmiş fəaliyyət geriyə zəng rejimində əlçatımlı deyil. Telefon <xliff:g id="COUNT">%s</xliff:g> dəqiqəlik bu rejimdə olacaq. İndi çıxmaq istəyirsiniz?"</item>
-    <item quantity="other" msgid="6115622137771382224">"Seçilmiş fəaliyyət geriyə zəng rejimində əlçatımlı deyil. Telefon <xliff:g id="COUNT">%s</xliff:g> dəqiqəlik bu rejimdə olacaq. İndi çıxmaq istəyirsiniz?"</item>
-  </plurals>
+    <plurals name="phone_in_ecm_notification_time" formatted="false" msgid="8308381858502470919">
+      <item quantity="other"><xliff:g id="COUNT_1">%s</xliff:g> dəqiqə ərzində məlumat bağlantısı yoxdur</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%s</xliff:g> dəqiqə ərzində məlumat bağlantısı yoxdur</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm" formatted="false" msgid="7179911675595441201">
+      <item quantity="other">Telefon <xliff:g id="COUNT_1">%s</xliff:g> dəqiqə Fövqəladə Cavab Zəngi rejimində olacaq. Bu rejimdə olarkən məlumat bağlantısından istifadə edən heç bir proqram istifadə edilə bilməz. İndi çıxmaq istəyirsiniz?</item>
+      <item quantity="one">Telefon <xliff:g id="COUNT_0">%s</xliff:g> dəqiqə Fövqəladə Cavab Zəngi rejimində olacaq. Bu rejimdə olarkən məlumat bağlantısından istifadə edən heç bir proqram istifadə edilə bilməz. İndi çıxmaq istəyirsiniz?</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm" formatted="false" msgid="8042973425225093895">
+      <item quantity="other">Seçilmiş fəaliyyət Fövqəladə Cavab Zəngi rejimində mövcud deyil. Telefon <xliff:g id="COUNT_1">%s</xliff:g> dəqiqə bu rejimdə olacaq. İndi çıxmaq istəyirsiniz?</item>
+      <item quantity="one">Seçilmiş fəaliyyət Fövqəladə Cavab Zəngi rejimində mövcud deyil. Telefon <xliff:g id="COUNT_0">%s</xliff:g> dəqiqə bu rejimdə olacaq. İndi çıxmaq istəyirsiniz?</item>
+    </plurals>
     <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Seçilmiş fəaliyyət təcili zəng zamanı mümkün deyil"</string>
     <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Təcili Geriyə Zəng Rejimindən Çıxır"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Bəli"</string>
@@ -499,95 +533,25 @@
     <string name="contactPhoto" msgid="4713193418046639466">"kontakt fotosu"</string>
     <string name="goPrivate" msgid="865837794424530980">"şəxsi rejimə keçin"</string>
     <string name="selectContact" msgid="781975788478987237">"kontakt seçin"</string>
-    <string name="sip_settings" msgid="6699045718560859691">"İnternet zəng ayarları"</string>
-    <string name="sip_accounts" msgid="2097054001288457163">"İnternet zəng (SIP) hesabları"</string>
-    <string name="sip_accounts_title" msgid="1212889069281054570">"Hesablar"</string>
-    <string name="sip_receive_calls" msgid="5635685570889971559">"Daxil olan zəngləri qəbul et"</string>
-    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Batareyanın ömrünü azaldır"</string>
-    <string name="sip_call_options_title" msgid="27433718808839672">"İnternet zəng istifadə edin"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"İnternet zəngi istifadə edin (yalnız Wi-Fi)"</string>
-    <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Data şəbəkəsi əlçatımlı olanda bütün şəbəkələr üçün"</string>
-    <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Yalnız İnternet zəngləri üçün"</string>
-    <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Hər zəng üçün soruş"</string>
-    <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Bütün zənglər üçün"</string>
-    <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Zəng edin"</string>
-    <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"İnternet zəng hesabını istifadə edin:"</string>
-    <string name="remember_my_choice" msgid="7058059586169290705">"İnternet zənglər etmək üçün həmişə istifadə edin"</string>
-    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Telefondan hansı internet zəng hesabının defolt olmasını seçə bilərsiniz &gt; Ayarlar &gt; İnternet zəng parametrləri &gt; Hesab ekranı"</string>
-    <string name="pstn_phone" msgid="8782554491484326429">"Mobil telefon zəngi"</string>
-    <string name="internet_phone" msgid="1147922660195095810">"İnternet zəng"</string>
-    <string name="no_sip_account_found_title" msgid="6266249392379373628">"İnternet zəng hesabı yoxdur"</string>
-    <string name="no_sip_account_found" msgid="724325811961769997">"Bu telefonda heç bir internet zəng hesabı yoxdur. Birini əlavə etmək istəyirsiniz mi?"</string>
-    <string name="sip_menu_add" msgid="8757508498518881500">"Əlavə edin"</string>
-    <string name="add_sip_account" msgid="5904858426290097611">"Hesab əlavə edin"</string>
-    <string name="remove_sip_account" msgid="7645900420385682570">"Hesabı silin"</string>
-    <string name="sip_account_list" msgid="5480058210652194306">"SIP hesabları"</string>
-    <string name="saving_account" msgid="52903398217017954">"Hesab yadda saxlanır..."</string>
-    <string name="removing_account" msgid="7183999896088628100">"Hesab silinir..."</string>
-    <string name="sip_menu_save" msgid="5842531129356014943">"Yadda saxla"</string>
-    <string name="sip_menu_discard" msgid="524075892158789701">"İmtina et"</string>
-    <string name="alert_dialog_close" msgid="7759635137627626235">"Profili bağlayın"</string>
-    <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
-    <string name="close_profile" msgid="6886968271423155284">"Bağla"</string>
-    <string name="primary_account_summary_with" msgid="1633960536212343187">"İlkin hesab. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
-    <string name="registration_status_checking_status" msgid="3381868307694056727">"Status yoxlanılır ..."</string>
-    <string name="registration_status_registering" msgid="4288401139400232968">"Qeydiyyatdan keçirilir..."</string>
-    <string name="registration_status_still_trying" msgid="3185581992666091911">"Hələ də cəhd edilir..."</string>
-    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Zəngləri qəbul etmir."</string>
-    <string name="registration_status_no_data" msgid="4901476962360656611">"İnternet bağlantısı olmadığı üçün hesab qeydiyyatı dayandırıldı."</string>
-    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Wi-Fi bağlantısı olmadığı üçün hesab qeydiyyatı dayandırıldı."</string>
-    <string name="registration_status_not_running" msgid="4824867184446232131">"Hesab qeydiyyatı uğursuz oldu."</string>
-    <string name="registration_status_done" msgid="884630717456439280">"Zəng qəbul olunur."</string>
-    <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Hesab qeydiyyatı uğursuz oldu: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); sonra cəhd olunacaq"</string>
-    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Hesab qeydiyyatı alınmadı: yanlış istifadə adı və ya parol"</string>
-    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Hesab qeydiyyatı uğursuz oldu: Server adını yoxlayın."</string>
-    <string name="third_party_account_summary" msgid="2532526738862533028">"Bu hesab hazırda <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> tətbiqi tərəfindən istifadə olunur."</string>
-    <string name="sip_edit_title" msgid="489288416435014385">"SIP hesab detalları"</string>
-    <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP hesab detalları"</string>
-    <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
-    <string name="username_title" msgid="2479375923477682328">"İstifadəçi adı"</string>
-    <string name="password_title" msgid="3323555249068171531">"Parol"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Gedən proksi ünvan"</string>
-    <string name="port_title" msgid="5952939408078626657">"Port nömrəsi"</string>
-    <string name="transport_title" msgid="8253139511847746640">"Nəqliyyat növü"</string>
-    <string name="send_keepalive_title" msgid="7533342573918645113">"Daima canlı göndərin"</string>
-    <string name="set_primary_title" msgid="5351892327447571451">"İlkin hesab olaraq ayarla"</string>
-    <string name="set_primary_summary" msgid="2219064654523258577">"Gedən zənglər üçün istifadə olunan"</string>
-    <string name="advanced_settings" msgid="8350631795335495338">"Əlavə seçimlər"</string>
-    <string name="auth_username_title" msgid="851473016307947120">"Autentifikasiya istifadəçi adı"</string>
-    <string name="auth_username_summary" msgid="6782012405225938629">"Autentifikasiya üçün istifadə edilən istifadəçi adı"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Təyin edilməyib&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;İstifadəçi adı ilə eyni&gt;"</string>
-    <string name="optional_summary" msgid="1464058793789832411">"&lt;İstəyə görə&gt;"</string>
-    <string name="advanced_settings_show" msgid="4668880308290857597">"Hamısını göstərmək üçün toxunun ▷"</string>
-    <string name="advanced_settings_hide" msgid="217398292824758079">"Hamısını gizlətmək üçün toxunun ▽"</string>
-    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> tələb olunur və boş buraxıla bilməz."</string>
-    <string name="not_a_valid_port" msgid="4796149266434630292">"Port 1000 və 65534 arasında olmalıdır."</string>
-    <string name="no_internet_available_title" msgid="3327109242858406165">"İnternet bağlantısı yoxdur"</string>
-    <string name="no_wifi_available_title" msgid="747881033089378758">"Wi-Fi bağlantısı yoxdur"</string>
-    <string name="no_internet_available" msgid="7877142631803238549">"İnternet zəngi üçün ilk olaraq internet əlaqəsini yoxlayın."</string>
-    <string name="no_wifi_available" msgid="1225073547318465713">"İnternet zənglər etmək üçün Wi-Fi şəbəkəsinə qoşulmalısınız (Wireless &amp; Şəbəkə parametrləri istifadə edin)."</string>
-    <string name="no_voip" msgid="8901474054537199865">"İnternet zəng dəstəklənmir"</string>
-    <string name="sip_system_decide" msgid="368030746310423471">"Avtomatik"</string>
-    <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Həmişə göndərin"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Səsli zəng dəstəklənmir"</string>
-    <string name="respond_via_sms_custom_message" msgid="6158880869935281078">"Özünüzünkünü yazın"</string>
-    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Tez cavablar"</string>
-    <!-- no translation found for respond_via_sms_menu_reset_default_activity (4029277930090150223) -->
-    <skip />
-    <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"Mesaj <xliff:g id="PHONE_NUMBER">%s</xliff:g> nömrəsinə göndərildi."</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Yığ"</string>
-    <string name="description_delete_button" msgid="4015842181592283903">"geri düyməsi"</string>
-    <string name="description_target_answer" msgid="7205604197797472471">"Cavab"</string>
-    <string name="description_target_send_sms" msgid="2098326025587950144">"SMS göndər"</string>
-    <string name="description_target_decline" msgid="4789834364389731957">"Rədd et"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrasiya"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrasiya"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Səs"</string>
-    <string name="default_notification_description" msgid="78174796906240970">"Defolt səs (<xliff:g id="DEFAULT_SOUND_TITLE">%1$s</xliff:g>)"</string>
-    <string name="ringtone_title" msgid="6374978286202084684">"Telefon zəng səsi"</string>
-    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Zəng çalanda vibrasiya olsun"</string>
-    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Yığım düymələrinin toxunuş tonları"</string>
-    <string name="dial_pad_autocomplete" msgid="494525952035761075">"Nömrə yığımı klaviaturası tamamlanması"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zəng səsi &amp; Vibrasiya"</string>
+    <string name="pstn_connection_service_label" msgid="1743245930577325900">"Daxili SIM kartlar"</string>
+    <string name="enable_video_calling_title" msgid="7237253660669000899">"Video çağrını aktivləşdirin"</string>
+    <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Video zəngi yandırmaq üçün siz şəbəkə parametrlərində 4G LTE Rejimini aktivləşdirməlisiniz."</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Şəbəkə ayarları"</string>
+    <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Bağla"</string>
+    <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Təcili zənglər"</string>
+    <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Yalnız təcili zəng"</string>
+    <string name="sim_description_default" msgid="4778679519938775515">"SIM kart, yuva: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Münasiblik"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Gələn Wi-Fi zəngi"</string>
+    <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>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index edfc778..02af705 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Изберете от кои профили могат да се извършват обаждания"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Обаждания през Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Без използване на услуга за обаждане през Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Без използване на помощник за обаждания"</string>
@@ -95,7 +97,7 @@
     <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>
@@ -109,23 +111,23 @@
     <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="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="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>
     <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>
@@ -333,10 +335,10 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активиране на устройството"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Настройка на услугата за данни"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Настройки за оператора"</string>
-    <string name="fdn" msgid="7878832555095183202">"Фиксирани номера за набиране"</string>
+    <string name="fdn" msgid="7878832555095183202">"Фиксирани номера"</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">"Списък с фиксирани номера за набиране (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
     <string name="fdn_enabled" msgid="5238109009915521240">"Фиксираните номера за набиране са активирани"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Фиксираните номера за набиране са деактивирани"</string>
@@ -375,9 +377,9 @@
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN не бе актуализирано, защото номерът не може да надвишава 20 цифри."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN не е актуализирано. PIN2 бе неправилен или телефонният номер бе отхвърлен."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Операцията с фиксираните номера за набиране (FDN) не бе успешна."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Извършва се четене на данни от SIM картата…"</string>
+    <string name="simContacts_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>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 е блокиран завинаги."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Остават ви <xliff:g id="NUMBER">%d</xliff:g> опита."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"ПИН2 кодът вече не е блокиран"</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="card_title_dialing" msgid="5769417478498348054">"Набиране"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"Набира се"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропуснато обаждане"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуснати обаждания"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> пропуснати обаждания"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуснато обаждане от <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Текущо обаждане"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Задържане на обаждането"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Входящо обаждане"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова гласова поща"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова гласова поща на (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Набиране на <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Затваряне"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Обратно обаждане"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Съобщение"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Изключете самолетния режим, за да осъществите обаждане."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Изключете самолетния режим или се свържете с безжична мрежа, за да осъществите обаждане."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Няма регистрация в мрежата."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодия и вибриране"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Вградени SIM карти"</string>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 50539db..3d40482 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"কোন অ্যাকাউন্টগুলি কল করতে পারবে তা নির্বাচন করুন"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi কলিং"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi কলিং ব্যবহার করবেন না"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"কল সহায়ক ব্যবহার করবেন না"</string>
@@ -377,7 +379,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">"SIM কার্ডটি থেকে পরিচিতিগুলি আমদানি করতে বিমান মোড বন্ধ করুন৷"</string>
     <string name="enable_pin" msgid="5422767284133234860">"সিম PIN সক্ষম/অক্ষম করুন"</string>
     <string name="change_pin" msgid="9174186126330785343">"সিম PIN পরিবর্তন করুন"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 স্থায়ীভাবে অবরুদ্ধ করা হয়েছে৷"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"আপনার কাছে <xliff:g id="NUMBER">%d</xliff:g>টি প্রচেষ্টা অবশিষ্ট রয়েছে৷"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"ডায়াল করা হচ্ছে"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ডায়াল করা হচ্ছে"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"মিসড কল"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"মিসড কলগুলি"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>টি মিসড কল"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> এর থেকে মিসড কল"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"চালু থাকা কল"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"সাময়িকভাবে স্থগিত রাখা হয়েছে"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"ইনকামিং কল"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"নতুন ভয়েসমেল"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"নতুন ভয়েসমেল (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> এ ডায়াল করুন"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"কল নামিয়ে রাখুন"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"কল ব্যাক করুন"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"বার্তা"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"কল করতে বিমান মোড বন্ধ করুন৷"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"বিমান মোড বন্ধ করুন বা কল করতে কোনো ওয়্যারলেস নেটওয়ার্কে সংযোগ করুন৷"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"নেটওয়ার্কে নিবন্ধিত নয়৷"</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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">"বিল্ট-ইন সিম কার্ডগুলি"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d8047a7..bfd3fee 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -42,8 +42,8 @@
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Sí"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"No"</string>
     <string name="wild_prompt_str" msgid="5543521676355533577">"Substitueix el caràcter comodí per"</string>
-    <string name="no_vm_number" msgid="4164780423805688336">"Falta el número de correu de veu"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"No hi ha cap número de correu de veu emmagatzemat a la targeta SIM."</string>
+    <string name="no_vm_number" msgid="4164780423805688336">"Falta el número de la bústia de veu"</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"No hi ha cap número de bústia de veu emmagatzemat a la targeta SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Afegeix número"</string>
     <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>
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Comptes del telèfon"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Afegeix un compte SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configura les opcions del compte"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Tots els comptes de trucades"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selecciona quins comptes poden fer trucades"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Trucades per Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"No facis servir les trucades per Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"No facis servir l\'assistent de trucades"</string>
@@ -79,7 +81,7 @@
     <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Permet que les aplicacions o els serveis gestionin les xarxes que es fan servir per a les trucades"</string>
     <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configura"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Servei de connexió incorporat"</string>
-    <string name="voicemail" msgid="8693759337917898954">"Correu de veu"</string>
+    <string name="voicemail" msgid="8693759337917898954">"Bústia de veu"</string>
     <string name="voicemail_settings_with_label" msgid="152724978380748296">"Bústia de veu (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"CV:"</string>
     <string name="networks" msgid="8873030692174541976">"Operadors de xarxa"</string>
@@ -91,7 +93,7 @@
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configuració addicional de trucades CDMA"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuració addicional de trucades només CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Configuració del servei de xarxa"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"Identificació de trucada"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"Identificador de l\'emissor"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Carregant la configuració..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Número amagat en trucades sortints"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Número mostrat a les trucades de sortida"</string>
@@ -99,8 +101,8 @@
     <string name="labelCW" msgid="6120513814915920200">"Trucada en espera"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Durant una trucada, avisa\'m de les trucades entrants"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Durant una trucada, avisa\'m de les trucades entrants"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Configuració de la desviació de trucades"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Configuració de la desviació de trucada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Configuració de desviació de trucades"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Configuració de desviació de trucada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Desviació de trucades"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Desvia sempre"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Utilitza sempre aquest número"</string>
@@ -108,21 +110,21 @@
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Totes les trucades es desvien a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"El número no està disponible"</string>
     <string name="sum_cfu_disabled" msgid="8384177689501334080">"Desactivat"</string>
-    <string name="labelCFB" msgid="6139853033106283172">"Quan estigui ocupat"</string>
-    <string name="messageCFB" msgid="3711089705936187129">"Número quan comunica"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Ocupat"</string>
+    <string name="messageCFB" msgid="3711089705936187129">"Número (línia ocupada)"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"S\'està desviant a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Desactivat"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"El teu operador no permet desactivar la desviació de trucades quan el telèfon està ocupat."</string>
-    <string name="labelCFNRy" msgid="1736067178393744351">"Quan no hi hagi resposta"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Número quan no hi ha resposta"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Sense resposta"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Número quan no hi hagi resposta"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"S\'està desviant a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Desactivat"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"El teu operador no permet desactivar la desviació de trucades quan el telèfon no respon."</string>
-    <string name="labelCFNRc" msgid="2614827454402079766">"Quan no estigui disponible"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"Número quan no es pugui establir la connexió"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"No localitzable"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Número quan no es pugui localitzar"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"S\'està desviant a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desactivat"</string>
-    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"El teu operador de telefonia mòbil no permet desactivar la desviació de trucades quan el telèfon no pot establir la trucada."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"El teu operador de telefonia mòbil no permet desactivar la desviació de trucades quan el telèfon estigui il·localitzable."</string>
     <string name="updating_title" msgid="6146755386174019046">"Configuració de trucada"</string>
     <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Només l\'usuari principal pot canviar la configuració de trucades."</string>
     <string name="call_settings_with_label" msgid="89359812614544532">"Configuració de trucades (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
@@ -143,12 +145,12 @@
     <item msgid="7876195870037833661">"Amaga el número"</item>
     <item msgid="1108394741608734023">"Mostra el número"</item>
   </string-array>
-    <string name="vm_changed" msgid="380744030726254139">"Número del correu de veu canviat."</string>
+    <string name="vm_changed" msgid="380744030726254139">"Número de la bústia de veu canviat."</string>
     <string name="vm_change_failed" msgid="3352934863246208918">"No s\'ha pogut canviar el número de bústia de veu.\nContacta amb el teu operador de telefonia mòbil si el problema continua."</string>
     <string name="fw_change_failed" msgid="5298103228470214665">"No s\'ha pogut canviar el número de desviació.\nContacta amb el teu operador de telefonia mòbil si el problema continua."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"No s\'ha pogut recuperar ni desar la configuració actual del número de desviació.\nVols canviar al proveïdor nou igualment?"</string>
     <string name="no_change" msgid="3186040086622435212">"No s\'ha fet cap canvi."</string>
-    <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Trieu un servei de correu de veu"</string>
+    <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Trieu un servei de bústia de veu"</string>
     <string name="voicemail_default" msgid="2001233554889016880">"Operador"</string>
     <string name="mobile_networks" msgid="2843854043339307375">"Configuració de la xarxa mòbil"</string>
     <string name="label_available" msgid="1181658289009300430">"Xarxes disponibles"</string>
@@ -208,7 +210,7 @@
     <string name="roaming_disable" msgid="1843417228755568110">"Estableix connexió amb serveis de dades en itinerància"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Has perdut la connectivitat de dades, perquè has abandonat la xarxa domèstica i la itinerància de dades està desactivada."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"És possible que se\'t facturin càrrecs elevats."</string>
-    <string name="roaming_alert_title" msgid="3654815360303826008">"Vols permetre la itinerància de dades?"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Permetre la itinerància de dades?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opcions de GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opcions de CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Ús de dades"</string>
@@ -375,9 +377,9 @@
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN no s\'ha actualitzat ja que el nombre no pot excedir els 20 dígits."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"El número FDN no s\'ha actualitzat. El PIN2 no és correcte o bé s\'ha rebutjat el número de telèfon."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Hi ha hagut un problema en l\'operació FDN."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"S\'està llegint de la targeta SIM..."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lectura de la targeta SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No hi ha cap contacte a la targeta SIM."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Seleccioneu contactes per importar-los"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Selecciona contactes per importar-los"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Per importar contactes de la targeta SIM, desactiva el mode d\'avió."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activa/Desactiva el PIN de la SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Canvia el PIN de la SIM"</string>
@@ -412,8 +414,9 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"El PUK2 s\'ha bloquejat de manera permanent."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Et queden <xliff:g id="NUMBER">%d</xliff:g> intents."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"El PIN2 ja no està bloquejat."</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Error de xarxa o de targeta SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Fet"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número del correu de veu"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número de la bústia de veu"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"S\'està marcant"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"S\'està tornant a marcar"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Trucada de conferència"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"En espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"S\'està penjant"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"En una trucada"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Marcatge"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Trucada perduda"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Trucades perdudes"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> trucades perdudes"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Trucada perduda de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Trucada en procés"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Trucada entrant"</string>
-    <string name="notification_voicemail_title" msgid="8933468752045550523">"Correu de veu nou"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Correu de veu nou (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Missatge de veu nou"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Bústia de veu nou (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marca <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número del correu de veu desconegut"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número de la bústia de veu desconegut"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sense servei"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La xarxa seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no està disponible"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Penja"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Torna la trucada"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Missatge"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Per fer una trucada, desactiva el mode d\'avió."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Per fer una trucada, desactiva el mode d\'avió o connecta amb una xarxa sense fil."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No registrat a la xarxa."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8d3dad7..72ac70f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonní účty"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Přidat účet SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurace nastavení účtu"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Všechny účty pro volání"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Vyberte, které účty mohou uskutečňovat volání"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Volání přes Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nepoužívat volání pomocí Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nepoužívat asistenta pro volání"</string>
@@ -99,8 +101,8 @@
     <string name="labelCW" msgid="6120513814915920200">"Další hovor na lince"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Oznamuje příchozí hovory i při probíhajícím hovoru"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Oznamovat příchozí hovory i při probíhajícím hovoru"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Nastavení přesměrování hovorů"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Nastavení přesměrování hovorů (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Přesměrování hovorů"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Přesměrování hovorů (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Přesměrování hovorů"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Přesměrovat vždy"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Vždy používat toto číslo"</string>
@@ -340,13 +342,13 @@
     <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>
-    <string name="enable_fdn" msgid="3740191529180493851">"Zapnout funkci Povolená tel. čísla"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Zapnout funkci Povolená tel. čísla"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Vypnout funkci Povolená tel. čísla"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Změna kódu PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Vypnout funkci Povolená tel. čísla"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Zapnout funkci Povolená tel. čísla"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Zapnout funkci Povolená tel. čísla"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Umožňuje spravovat povolená telefonní čísla"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Umožňuje změnit kód PIN pro přístup k povoleným telefonním číslům"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Umožňuje změnit kód PIN pro přístup k povoleným telefonním číslům"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Správa telefonního seznamu"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Ochrana soukromí v hlasové poště"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Povolit režim vylepšené ochrany soukromí"</string>
@@ -377,7 +379,7 @@
     <string name="fdn_failed" msgid="540018079008319747">"Operace s čísly FDN se nezdařila."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čtení ze SIM karty..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Na SIM kartě nejsou žádné kontakty."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Vybrat kontakty pro import"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Kontakty pro import"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Chcete-li importovat kontakty ze SIM karty, vypněte režim Letadlo."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Povolit nebo zakázat PIN SIM karty"</string>
     <string name="change_pin" msgid="9174186126330785343">"Změnit PIN SIM karty"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 je trvale zablokován."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Počet zbývajících pokusů: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 již není blokován"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Došlo k chybě sítě nebo SIM karty."</string>
     <string name="doneButton" msgid="2859593360997984240">"Hotovo"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Číslo hlasové schránky"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Vytáčení"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Přidržený hovor"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Ukončování hovoru"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Probíhá hovor"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Vytáčení"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Zmeškaný hovor"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Zmeškané hovory"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Zmeškané hovory: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>."</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Zmeškaný hovor od volajícího <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>."</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Probíhající hovor"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Přidržený hovor"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Příchozí hovor"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nová hlasová zpráva"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nová hlasová zpráva (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Volat hlasovou schránku <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Číslo hlasové schránky je neznámé."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Žádný signál"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Vybraná síť (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) není k dispozici"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Zavěsit"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zavolat zpět"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Zpráva"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Chcete-li provést hovor, vypněte režim Letadlo."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Chcete-li se připojit k bezdrátové síti a provést hovor, vypněte režim Letadlo."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Přihlášení k síti nebylo úspěšné."</string>
@@ -551,6 +543,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"vytáčení"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrace"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrace"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Vyzvánění a vibrace"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Vestavěné SIM karty"</string>
@@ -561,7 +555,7 @@
     <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Tísňová volání"</string>
     <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Pouze tísňová volání"</string>
     <string name="sim_description_default" msgid="4778679519938775515">"SIM karta, slot: <xliff:g id="SLOT_ID">%s</xliff:g>"</string>
-    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Usnadnění"</string>
+    <string name="accessibility_settings_activity_title" msgid="8562004288733103868">"Přístupnost"</string>
     <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"Příchozí hovor přes Wi-Fi"</string>
     <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>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0ec783a..232d4e9 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonkonti"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Tilføj en SIP-konto"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurer kontoindstillinger"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Alle opkaldskonti"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Vælg, hvilke konti der kan foretage opkald"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Opkald via Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Undlad at bruge Wi-Fi-opkald"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Undlad at bruge opkaldsassistent"</string>
@@ -91,11 +93,11 @@
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Yderligere CDMA-opkaldsindstillinger"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Yderligere indstillinger for CDMA-opkald"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Indstillinger for netværkstjeneste"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"Opkalds-id"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"Vis nummer"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Indlæser indstillinger…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nummer skjules i udgående opkald"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer vises i udgående opkald"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Brug udbyderens standardindstillinger til at vise mine numre i udgående opkald"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Brug mobilselskabets standardindstillinger til at vise mit nummer ved udgående opkald"</string>
     <string name="labelCW" msgid="6120513814915920200">"Ventende opkald"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Fortæl mig om indgående opkald under et opkald"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Fortæl mig om indgående opkald under et opkald"</string>
@@ -342,7 +344,7 @@
     <string name="fdn" msgid="7878832555095183202">"Numre til begrænset opkald"</string>
     <string name="fdn_with_label" msgid="187084204115493366">"Begrænset opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste over numre til begrænset opkald"</string>
-    <string name="fdn_list_with_label" msgid="7437232552210469217">"Liste over faste opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Numre til begrænset opkald (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivering af begrænset opkald"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Numre til begrænset opkald er aktiveret"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Numre til begrænset opkald er deaktiveret"</string>
@@ -418,6 +420,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 er permanent blokeret."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Du har <xliff:g id="NUMBER">%d</xliff:g> forsøg tilbage."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"Pinkode 2 er ikke længere blokeret"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Fejl i netværk eller SIM-kort"</string>
     <string name="doneButton" msgid="2859593360997984240">"Afslut"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Telefonsvarernummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Ringer op"</string>
@@ -428,23 +431,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Ventende"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lægger på"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Opkald i gang"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Ringer op"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ubesvarede opkald"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Ubesvarede opkald"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ubesvarede opkald"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Ubesvarede opkald fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Igangværende opkald"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Ventende"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Indgående opkald"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ny telefonsvarerbesked"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nye telefonsvarerbeskeder (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Ring til <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Telefonsvarernummeret er ukendt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen dækning"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Det valgte netværk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgængeligt"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Læg på"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring tilbage"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Besked"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Slå flytilstand fra for at foretage et opkald."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Slå flytilstand fra, eller opret forbindelse til et trådløst netværk for at foretage et opkald."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ikke registreret på netværk."</string>
@@ -551,6 +543,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"ring op"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibration"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibration"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Lyd"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringetone og vibration"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Indbyggede SIM-kort"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b177bdc..7926443 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -68,8 +68,10 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonkonten"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP-Konto hinzufügen"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Kontoeinstellungen konfigurieren"</string>
-    <string name="wifi_calling" msgid="739018212480165598">"WLAN-Telefonie"</string>
-    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Keine WLAN-Anrufe nutzen"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Alle Anrufkonten"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Auswählen, welche Konten Anrufe tätigen können"</string>
+    <string name="wifi_calling" msgid="739018212480165598">"Anrufe über WLAN"</string>
+    <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Option \"Anrufe über WLAN\" nicht nutzen"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Keinen Anrufassistenten nutzen"</string>
     <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"Ohne"</string>
     <string name="wifi_calling_call_assistant" msgid="229102032881680320">"Anrufassistent"</string>
@@ -416,6 +418,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 wurde endgültig gesperrt."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Sie haben noch <xliff:g id="NUMBER">%d</xliff:g> Versuche."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 nicht mehr gesperrt"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Netzwerk- oder SIM-Kartenfehler"</string>
     <string name="doneButton" msgid="2859593360997984240">"Fertig"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Mailboxnummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Rufaufbau"</string>
@@ -426,23 +429,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Gehaltener Anruf"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Auflegen"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Anruf"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Verbindung wird aufgebaut..."</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Entgangener Anruf"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Entgangene Anrufe"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> entgangene Anrufe"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Entgangener Anruf von <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Aktueller Anruf"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Gehaltener Anruf"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Eingehender Anruf"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Neue Nachricht"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Neue Nachricht (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> wählen"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Mailboxnummer unbekannt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"kein Dienst"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Ausgewähltes Netzwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nicht verfügbar"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Beenden"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zurückrufen"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Nachricht"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Deaktivieren Sie zum Telefonieren den Flugmodus."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Deaktivieren Sie zum Telefonieren den Flugmodus oder stellen Sie eine WLAN-Verbindung her."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nicht in Netzwerk registriert."</string>
@@ -549,6 +541,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"Wählen"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibration"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibration"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Töne"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Klingelton &amp; Vibration"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Integrierte SIM-Karten"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 990ddc5..a1b61f1 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Επιλέξτε τους λογαριασμούς που μπορούν να πραγματοποιήσουν κλήσεις"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Κλήση Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Να μη χρησιμοποιηθεί η κλήση μέσω Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Να μη χρησιμοποιηθεί βοηθός κλήσης"</string>
@@ -80,7 +82,7 @@
     <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Διαμόρφωση"</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>
+    <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>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Εκπομπές έκτακτης ανάγκης"</string>
@@ -96,7 +98,7 @@
     <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="labelCW" msgid="6120513814915920200">"Αναμ. κλήσ."</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="call_forwarding_settings" msgid="3378927671091537173">"Ρυθμίσεις προώθησης κλήσης"</string>
@@ -113,7 +115,7 @@
     <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="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>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"Ο κωδικός PUK2 έχει μπλοκαριστεί οριστικά."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Απομένουν <xliff:g id="NUMBER">%d</xliff:g> προσπάθειες."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"Κλήση"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"Κλήση"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Αναπάντητη κλήση"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Αναπάντητες κλήσεις"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> αναπάντητες κλήσεις"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Αναπάντητη κλήση από <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Κλήση σε εξέλιξη"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Σε αναμονή"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Εισερχόμενη κλήση"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Νέο μήνυμα στον αυτόματο τηλεφωνητή"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Νέο μήνυμα στον αυτόματο τηλεφωνητή (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Καλέστε <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Τερματισμός κλήσης"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Επανάκληση"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Μήνυμα"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Απενεργοποιήστε τη λειτουργία κλήσης για να πραγματοποιήσετε μια κλήση."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Απενεργοποιήστε τη λειτουργία πτήσης ή συνδεθείτε σε ένα ασύρματο δίκτυο για να πραγματοποιήσετε μια κλήση."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Δεν έχετε εγγραφεί στο δίκτυο."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ήχος"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ήχος κλήσης &amp; δόνηση"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ενσωματωμένες κάρτες SIM"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 09dd8a0..a6732a6 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Phone accounts"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Add SIP account"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configure account settings"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"All calling accounts"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Select which accounts can make calls"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi Calling"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Do not use Wi-Fi calling"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Do not use call assistant"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanently blocked."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"You have <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 no longer blocked"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Network or SIM card error"</string>
     <string name="doneButton" msgid="2859593360997984240">"Done"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dialling"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"On hold"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Hanging up"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> missed calls"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"On-going call"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"On hold"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Incoming call"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"New voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"New voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemail number unknown"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"No service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Hang up"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Call back"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Turn off aeroplane mode to make a call."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Turn off aeroplane mode or connect to a wireless network to make a call."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
@@ -545,6 +537,7 @@
     <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrate"</string>
+    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sound"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Built-in SIM cards"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 09dd8a0..a6732a6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Phone accounts"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Add SIP account"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configure account settings"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"All calling accounts"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Select which accounts can make calls"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi Calling"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Do not use Wi-Fi calling"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Do not use call assistant"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanently blocked."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"You have <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 no longer blocked"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Network or SIM card error"</string>
     <string name="doneButton" msgid="2859593360997984240">"Done"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dialling"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"On hold"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Hanging up"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> missed calls"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"On-going call"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"On hold"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Incoming call"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"New voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"New voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemail number unknown"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"No service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Hang up"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Call back"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Turn off aeroplane mode to make a call."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Turn off aeroplane mode or connect to a wireless network to make a call."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
@@ -545,6 +537,7 @@
     <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrate"</string>
+    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sound"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Built-in SIM cards"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 09dd8a0..a6732a6 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Phone accounts"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Add SIP account"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configure account settings"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"All calling accounts"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Select which accounts can make calls"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi Calling"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Do not use Wi-Fi calling"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Do not use call assistant"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 is permanently blocked."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"You have <xliff:g id="NUMBER">%d</xliff:g> remaining attempts."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 no longer blocked"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Network or SIM card error"</string>
     <string name="doneButton" msgid="2859593360997984240">"Done"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dialling"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"On hold"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Hanging up"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"In call"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Dialling"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missed call"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> missed calls"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"On-going call"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"On hold"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Incoming call"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"New voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"New voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dial <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemail number unknown"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"No service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Hang up"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Call back"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Turn off aeroplane mode to make a call."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Turn off aeroplane mode or connect to a wireless network to make a call."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
@@ -545,6 +537,7 @@
     <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrate"</string>
+    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Visual Voicemail"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sound"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone &amp; Vibrate"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Built-in SIM cards"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 38f1d26..dc72b63 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Cuentas telefónicas"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Agregar cuenta SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Cómo configurar la cuenta"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Todas las cuentas telefónicas"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Elige las cuentas que pueden realizar llamadas."</string>
     <string name="wifi_calling" msgid="739018212480165598">"Llamada por Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"No utilizar llamadas por Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"No utilizar asistente de llamadas"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"El código PUK2 se bloqueó de forma permanente."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Te quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"El PIN2 ya no está bloqueado."</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Error en la red o en la tarjeta SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Finalizado"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Núm. de correo de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Marcando"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"En espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Colgando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"En llamada"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Marcando"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Llamada perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Llamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> llamadas perdidas"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Se perdieron las llamadas de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Llamada en curso"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Llamada entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Correo de voz nuevo"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Correo de voz nuevo (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número de correo de voz desconocido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sin servicio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La red seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no está disponible"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Devolver llamada"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaje"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Desactivar modo de avión para hacer una llamada"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desactivar el modo de avión o conectarse a una red inalámbrica para hacer una llamada"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No registrado en la red."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonido"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Tarjetas SIM integradas"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 89981da..57c4761 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -58,7 +58,7 @@
     <string name="labelCDMAMore" msgid="1630676740428229339">"Ajustes de llamadas CDMA"</string>
     <string name="labelCdmaMore_with_label" msgid="6333588719319970399">"Ajustes de llamada de CDMA (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="apn_settings" msgid="9043423184895642077">"APN"</string>
-    <string name="settings_label" msgid="3876743539816984008">"Configuración de red"</string>
+    <string name="settings_label" msgid="3876743539816984008">"Ajustes de red"</string>
     <string name="phone_accounts" msgid="6376603393888116364">"Cuentas de llamadas"</string>
     <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Realizar llamadas con"</string>
     <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Realizar llamadas SIP con"</string>
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Cuentas de teléfono"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Añadir cuenta SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurar ajustes de cuenta"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Todas las cuentas de llamadas"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selecciona las cuentas que pueden realizar llamadas"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Llamadas Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"No usar llamadas Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"No usar asistente de llamadas"</string>
@@ -85,25 +87,25 @@
     <string name="networks" msgid="8873030692174541976">"Operadores de red"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Difusiones de emergencia"</string>
     <string name="call_settings" msgid="6112441768261754562">"Ajustes de llamadas"</string>
-    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Configuración adicional"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Ajustes adicionales"</string>
     <string name="additional_gsm_call_settings_with_label" msgid="1385241520708457376">"Ajustes adicionales (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Configuración adicional de llamadas solo GSM"</string>
-    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Configuración adicional de llamadas CDMA"</string>
-    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuración adicional de llamadas solo CDMA"</string>
-    <string name="labelNwService" msgid="4699970172021870983">"Configuración del servicio de red"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"ID de emisor"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Ajustes adicionales de llamadas solo GSM"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Ajustes adicionales de llamadas CDMA"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Ajustes adicionales de llamadas solo CDMA"</string>
+    <string name="labelNwService" msgid="4699970172021870983">"Ajustes del servicio de red"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"Identificador del emisor"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Cargando ajustes…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Número oculto en llamadas salientes"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Número mostrado en llamadas salientes"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizar la configuración predeterminada del operador para mostrar mi número en las llamadas salientes"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizar ajustes predeterminados del operador para mostrar mi número en las llamadas salientes"</string>
     <string name="labelCW" msgid="6120513814915920200">"Llamada en espera"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Notificarme de llamadas entrantes durante una llamada"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Notificar si hay una llamada entrante durante una llamada"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Ajustes de desvío de llamadas"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Ajustes de reenvío de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Desvío de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Desvío de llamada"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Desviar siempre"</string>
-    <string name="messageCFU" msgid="3560082430662923687">"Utilizar siempre este número"</string>
+    <string name="messageCFU" msgid="3560082430662923687">"Usar siempre este número"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Desviar todas las llamadas"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Desviando todas las llamadas a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Número no disponible"</string>
@@ -127,9 +129,9 @@
     <string name="call_settings_primary_user_only" msgid="5679923943740900965">"El usuario principal es el único que puede cambiar los ajustes de llamadas."</string>
     <string name="call_settings_with_label" msgid="89359812614544532">"Ajustes de llamadas (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Error de configuración de llamada"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Leyendo configuración..."</string>
-    <string name="updating_settings" msgid="8171225533884883252">"Actualizando configuración..."</string>
-    <string name="reverting_settings" msgid="4752151682666912828">"Restableciendo configuración…"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Leyendo ajustes..."</string>
+    <string name="updating_settings" msgid="8171225533884883252">"Actualizando ajustes..."</string>
+    <string name="reverting_settings" msgid="4752151682666912828">"Restableciendo ajustes…"</string>
     <string name="response_error" msgid="6674110501330139405">"Respuesta inesperada de la red"</string>
     <string name="exception_error" msgid="7027667130619518211">"Error en la tarjeta SIM o en la red."</string>
     <string name="fdn_check_failure" msgid="18200614306525434">"La opción de marcación fija de la aplicación Teléfono está activada. Por ello, algunas funciones relacionadas con las llamadas no funcionan correctamente."</string>
@@ -230,7 +232,7 @@
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS de difusión móvil"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS de difusión móvil habilitado"</string>
     <string name="cell_bc_sms_disable" msgid="3398365088309408749">"SMS de difusión móvil inhabilitado"</string>
-    <string name="cb_sms_settings" msgid="651715019785107312">"Configuración de SMS de difusión móvil"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"Ajustes de SMS de difusión móvil"</string>
     <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Difusión de emergencia"</string>
     <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Difusión de emergencia habilitada"</string>
     <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Difusión de emergencia inhabilitada"</string>
@@ -416,6 +418,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"El PUK2 se ha bloqueado de forma permanente."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Quedan <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 desbloqueado"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Error en la tarjeta SIM o en la red"</string>
     <string name="doneButton" msgid="2859593360997984240">"Listo"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número del buzón de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Llamando"</string>
@@ -426,23 +429,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"En espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Colgando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Llamada entrante"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Llamando..."</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Llamada perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Llamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> llamadas perdidas"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Llamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Llamada en curso"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Llamada entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuevo mensaje de voz"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Buzón de voz nuevo (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número del buzón de voz desconocido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sin servicio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La red seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no está disponible."</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Llamar"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaje"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Desactiva el modo avión parra hacer llamadas."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desactiva el modo avión o conéctate a una red inalámbrica para hacer llamadas."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No se ha podido conectar a la red"</string>
@@ -549,12 +541,14 @@
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonido"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tono y vibración"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Tarjetas SIM integradas"</string>
     <string name="enable_video_calling_title" msgid="7237253660669000899">"Activar videollamadas"</string>
     <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Para activar las videollamadas, debes habilitar el modo 4G LTE en los ajustes de red."</string>
-    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Configuración de red"</string>
+    <string name="enable_video_calling_dialog_settings" msgid="576528473599603249">"Ajustes de red"</string>
     <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Cerrar"</string>
     <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Llamadas de emergencia"</string>
     <string name="sim_description_emergency_calls" msgid="7535215397212301562">"Solo llamadas de emergencia"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index d5fe424..908938b 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefoni kontod"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP-konto lisamine"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konto seadete seadistamine"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Kõik kõnekontod"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Valige, milliste kontodega saab helistada"</string>
     <string name="wifi_calling" msgid="739018212480165598">"WiFi-kõned"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ärge kasutage WiFi-kõnesid"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ärge kasutage kõneabi"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 on püsivalt blokeeritud."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Teil on veel <xliff:g id="NUMBER">%d</xliff:g> katset."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN-kood 2 ei ole enam blokeeritud"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Võrgu või SIM-kaardi viga"</string>
     <string name="doneButton" msgid="2859593360997984240">"Valmis"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Kõnepostinumber"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Valimine"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Ootel"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lõpetamisel"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Kõne"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Valimine"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Vastamata kõne"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Vastamata kõned"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> vastamata kõnet"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Vastamata kõne helistajalt <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Käimasolev kõne"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Ootel"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Sissetulev kõne"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Uus kõnepost"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Uus kõnepost (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Valige <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Kõneposti number teadmata"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Teenus puudub"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valitud võrk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) pole saadaval"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Lõpeta kõne"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Helista tagasi"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Sõnum"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Helistamiseks lülitage lennukirežiim välja."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Helistamiseks lülitage lennukirežiim välja või looge ühendus traadita võrguga."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ei ole võrku registreeritud."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"helista"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreerimine"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreerimine"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Heli"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Helin ja vibratsioon"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Sisseehitatud SIM-kaardid"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 5e00781..f05677e 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonoko kontuak"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Gehitu SIP kontua"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfiguratu kontuaren ezarpenak"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Deiak egiteko kontu guztiak"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Hautatu zein kontutatik egin daitezkeen deiak"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi bidezko deiak"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ez erabili Wi-Fi bidezko deiak"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ez erabili deiak egiteko laguntzailea"</string>
@@ -418,6 +420,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kodea betirako blokeatu da."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> saiakera gelditzen zaizkizu."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 kodea desblokeatu da"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Sarearen edo SIM txartelaren errorea"</string>
     <string name="doneButton" msgid="2859593360997984240">"Eginda"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Erantzungailuaren zenbakia"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Deitzen"</string>
@@ -428,23 +431,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Zain"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Deia amaitzen"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Deia abian"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Markatzen"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Dei galdua"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Dei galduak"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> dei galdu"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Deitzaile honen dei galdua: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Abian den deia"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Zain"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Sarrerako deia"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ahots-mezu berria"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Ahots-mezu berriak (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Markatu <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Erantzungailuaren zenbakia ezezaguna da"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ez dago zerbitzurik"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Hautatutako sarea (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ez dago erabilgarri"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Amaitu deia"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Erantzun deiari"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mezua"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Deia egiteko, desaktibatu hegaldi modua."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Deia egiteko, desaktibatu hegaldi modua edo konektatu haririk gabeko sare batera."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ez dago sarean erregistratuta."</string>
@@ -551,6 +543,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"markatu"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Egin dar-dar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Egin dar-dar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Soinua"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tonua eta dardara"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"SIM txartel integratuak"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 6e2c40e..79b3501 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"انتخاب حساب‌هایی که می‌توانند تماس بگیرند"</string>
     <string name="wifi_calling" msgid="739018212480165598">"‏تماس از طریق Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"‏از تماس از طریق Wi-Fi استفاده نشود"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"از دستیار تماس استفاده نشود"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"‏PUK2 به صورت دائمی مسدود شده است."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> تلاش باقی‌مانده دارید."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"‏PIN2 دیگر مسدود نیست"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"خطای شبکه یا سیم‌کارت"</string>
     <string name="doneButton" msgid="2859593360997984240">"انجام شد"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"شماره پست صوتی"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"شماره گیری"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"شماره‌گیری"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"تماس بی پاسخ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"تماس‌های بی پاسخ"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> تماس بی پاسخ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"تماس بی پاسخ از <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"تماس جاری"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"در انتظار"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"تماس ورودی"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"پست صوتی جدید"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"پست صوتی جدید (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"شماره گیری <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"قطع تماس"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"پاسخ تماس"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"پیام"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"برای برقراری تماس، حالت پرواز را خاموش کنید."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"برای برقرای تماس، حالت پرواز را خاموش کنید یا به شبکه بی‌سیم وصل شوید."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"در شبکه ثبت نشده است."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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">"سیم‌کارت‌های داخلی"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c86a742..376ad47 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Puhelintilit"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Lisää SIP-tili"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Tiliasetusten määrittäminen"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Kaikki puhelutilit"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Valitse, mitkä tilit voivat soittaa puheluita."</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-puhelut"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Älä käytä puheluihin Wi-Fiä"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Älä käytä puheluapuria"</string>
@@ -416,6 +418,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-koodi on pysyvästi estetty."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> yritystä jäljellä."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-koodi ei ole enää estetty"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Verkko- tai SIM-korttivirhe"</string>
     <string name="doneButton" msgid="2859593360997984240">"Valmis"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Puhelinvastaajan numero"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Soitetaan"</string>
@@ -426,23 +429,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Pidossa"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Katkaistaan"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Puhelun aikana"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Soitetaan"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Vastaamatta jäänyt puhelu"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Vastaamattomat puhelut"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> vastaamatonta puhelua"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Vastaamatta jäänyt puhelu numerosta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Käynnissä oleva puhelu"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Pidossa"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Uusi puhelu"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Uusia viestejä vastaajassa"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Uusia viestejä vastaajassa (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Soita numeroon <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Puhelinvastaajan numero tuntematon"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Katvealueella"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valittu verkko (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ei käytettävissä."</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Katkaise puhelu"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Soita takaisin"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Viesti"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Poista lentokonetila käytöstä, jos haluat soittaa puhelun."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Poista lentokonetila käytöstä tai yhdistä langattomaan verkkoon, jos haluat soittaa puhelun."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ei rekisteröity verkkoon."</string>
@@ -549,6 +541,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"soita"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Värinä"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Värinä"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ääni"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Soittoääni ja värinä"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Sisäiset SIM-kortit"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ae16a04..2d4a5b4 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Comptes du téléphone"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Ajouter un compte SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurer les paramètres du compte"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Tous les comptes d\'appel"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Sélectionner les comptes pour lesquels les appels sont activés"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Appels Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne pas utiliser les appels par Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne pas utiliser l\'assistant d\'appel"</string>
@@ -416,6 +418,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"Le code PUK2 est bloqué définitivement."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"Le NIP2 n\'est plus bloqué."</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Erreur de réseau ou de carte SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Terminé"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"N° messagerie vocale"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Numérotation en cours…"</string>
@@ -426,23 +429,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"En attente"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Fin d\'appel"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Appel en cours"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Numérotation en cours…"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Appel manqué"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Appels manqués"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> appels manqués"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Appel en cours"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"En attente"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Appel entrant"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nouveau message vocal"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nouveaux messages vocaux (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Composer <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numéro de messagerie vocale inconnu"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Aucun service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Réseau sélectionné (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponible"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Raccrocher"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Rappeler"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Désactivez le mode Avion pour faire un appel."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Désactivez le mode Avion ou connectez-vous à un réseau Wi-Fi pour faire un appel."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Non enregistré sur le réseau"</string>
@@ -549,6 +541,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreur"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Son"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartes SIM intégrées"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5ddde48..7840b86 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Comptes téléphone"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Ajouter un compte SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurer les paramètres du compte"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Tous les comptes téléphoniques"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Sélectionner les comptes pour lesquels les appels sont activés"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Appels Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne pas utiliser les appels Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne pas utiliser l\'assistant d\'appel"</string>
@@ -80,7 +82,7 @@
     <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Configurer"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Service de connexion intégré"</string>
     <string name="voicemail" msgid="8693759337917898954">"Messagerie vocale"</string>
-    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Messagerie vocale (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Mess. vocale (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"MV :"</string>
     <string name="networks" msgid="8873030692174541976">"Opérateurs de réseau"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Messages d\'urgence"</string>
@@ -125,7 +127,7 @@
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Votre opérateur ne permet pas la désactivation du transfert d\'appel lorsque votre téléphone n\'est pas joignable."</string>
     <string name="updating_title" msgid="6146755386174019046">"Paramètres d\'appel"</string>
     <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Seul l\'utilisateur principal peut modifier les paramètres d\'appel."</string>
-    <string name="call_settings_with_label" msgid="89359812614544532">"Paramètres d\'appel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Param. d\'appel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Erreur des paramètres d\'appel"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lecture des paramètres..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Mise à jour des paramètres..."</string>
@@ -377,7 +379,7 @@
     <string name="fdn_failed" msgid="540018079008319747">"Échec de l\'opération liée aux numéros autorisés."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lecture de la carte SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Aucun contact n\'a été trouvé sur votre carte SIM."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Sélection des contacts à importer"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Sélection des contacts"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Désactivez le mode Avion pour importer des contacts depuis la carte SIM."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activer/désactiver le code PIN de la carte SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Modifier le code PIN de la carte SIM"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"La clé PUK2 est bloquée de manière définitive."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Il vous reste <xliff:g id="NUMBER">%d</xliff:g> tentatives."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"Le code PIN2 n\'est plus bloqué."</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Erreur de réseau ou de carte SIM."</string>
     <string name="doneButton" msgid="2859593360997984240">"OK"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"N° messagerie vocale"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Appel en cours…"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"En attente"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Fin de l\'appel.."</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Appel en cours"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Numérotation en cours…"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Appel manqué"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Appels manqués"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> appels manqués"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Appel en cours"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"En attente"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Appel entrant"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nouveau message vocal"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nouveaux messages vocaux (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Composer le <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numéro de messagerie vocale inconnu"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Aucun service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Réseau sélectionné (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponible"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Raccrocher"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Rappeler"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Désactivez le mode Avion pour passer un appel."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Désactivez le mode Avion ou connectez-vous à un réseau sans fil pour passer un appel."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Non enregistré sur le réseau."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreur"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sonnerie"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Sonnerie et vibreur"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartes SIM intégrées"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 70c70ab..35e7660 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Contas do teléfono"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Engadir conta SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Determinar configuración da conta"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Todas as contas de chamadas"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selecciona as contas que poden facer chamadas"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Chamadas por wifi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Non utilizar as chamadas wifi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Non utilizar o asistente de chamadas"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"O PUK2 está permanentemente bloqueado."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Quédanche <xliff:g id="NUMBER">%d</xliff:g> intentos."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"O PIN2 xa non está bloqueado"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Erro de rede ou de tarxeta SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Feito"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número de correo de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Marcación"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"En espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Desconectando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Chamada en curso"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Marcación"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chamadas perdidas"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada en curso"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Chamada entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correo de voz"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Novo correo de voz (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marcar o <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número de correo de voz descoñecido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sen servizo"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rede seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non dispoñible"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Devolver chamada"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaxe"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Desactiva o modo avión para facer unha chamada."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desactiva o modo avión ou conéctate a unha rede sen fíos para facer unha chamada."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Sen rexistro na rede"</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Son"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de chamada e vibración"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Tarxetas SIM integradas"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index 5f1bc61..3511bc2 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"કયા એકાઉન્ટ્સ કૉલ કરી શકે તે પસંદ કરો"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi કૉલિંગ"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi કૉલિંગનો ઉપયોગ કરશો નહીં"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"કૉલ સહાયકનો ઉપયોગ કરશો નહીં"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ને કાયમી રૂપે અવરોધિત કરેલ છે."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"તમારી પાસે <xliff:g id="NUMBER">%d</xliff:g> પ્રયાસ બાકી છે."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"ડાયલ કરી રહ્યાં છે"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ડાયલ કરી રહ્યાં છે"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"છૂટેલો કૉલ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"છૂટેલા કૉલ્સ"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> છૂટેલા કૉલ્સ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> નો કૉલ ચૂકી ગયાં"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"ચાલી રહેલ કૉલ"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"હોલ્ડ પર"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"આવનાર કૉલ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"નવો વૉઇસમેઇલ"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"નવો વૉઇસમેઇલ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ડાયલ કરો"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"સમાપ્ત કરો"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"કૉલ બેક"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"સંદેશ"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"કૉલ કરવા માટે એરપ્લેન મોડ બંધ કરો."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"કૉલ કરવા માટે એરપ્લેન મોડ બંધ કરો અથવા વાયરલેસ નેટવર્કથી કનેક્ટ કરો."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"નેટવર્ક પર નોંધણી કરાયેલ નથી."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ધ્વનિ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"રિંગટોન અને વાઇબ્રેટ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"બિલ્ટ-ઇન SIM કાર્ડ્સ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d8cde4c..d34d600 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"चुनें कि कौन से खाते कॉल कर सकते हैं"</string>
     <string name="wifi_calling" msgid="739018212480165598">"वाई-फ़ाई कॉलिंग"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"वाई-फ़ाई कॉलिंग का उपयोग न करें"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"कॉल सहायक का उपयोग न करें"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 स्थायी रूप से अवरोधित है."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"आपके पास <xliff:g id="NUMBER">%d</xliff:g> प्रयास शेष हैं."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"डायल कर रहा है"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"डायल हो रहा है"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"छूटी कॉल"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"छूटी कॉल"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> छूटी कॉल"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> की कॉल छूटी"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"चल रही कॉल"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"होल्ड पर"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"इनकमिंग कॉल"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"नया वॉयस मेल"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"नई वॉयस मेल (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> डायल करें"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"समाप्त करें"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"वापस कॉल करें"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"संदेश"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"कॉल करने के लिए हवाई जहाज़ मोड बंद करें."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"कॉल करने के लिए हवाई जहाज़ मोड बंद करें या किसी वायरलेस नेटवर्क से कनेक्‍ट करें."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"नेटवर्क पर पंजीकृत नहीं."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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">"अंतर्निहित सिम कार्ड"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bcc58c4..5e414c5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonski računi"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Dodaj SIP račun"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfiguriranje postavki računa"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Svi računi za pozivanje"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Odaberite račune koji mogu upućivati pozive"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi pozivi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne upotrebljavaj Wi-Fi pozive"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne upotrebljavaj pomoćnik za pozive"</string>
@@ -100,7 +102,7 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Obavijesti me tijekom poziva o dolaznim pozivima"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Obavijesti me tijekom poziva o dolaznim pozivima"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Postavke preusmjeravanja poziva"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Postavke prosljeđivanja poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Prosljeđivanje poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Preusmjeravanje poziva"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Uvijek preusmjeri"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Uvijek koristi ovaj broj"</string>
@@ -108,7 +110,7 @@
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Preusmjeravanje poziva na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Broj je nedostupan"</string>
     <string name="sum_cfu_disabled" msgid="8384177689501334080">"Isključeno"</string>
-    <string name="labelCFB" msgid="6139853033106283172">"Kad je zauzeto"</string>
+    <string name="labelCFB" msgid="6139853033106283172">"Kad je broj zauzet"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Broj u slučaju zauzeća"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Preusmjeravanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Isključeno"</string>
@@ -118,14 +120,14 @@
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Preusmjeravanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Isključeno"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Vaš mobilni operater ne podržava onemogućavanje preusmjeravanja poziva ako se na vaš telefon nitko ne javi."</string>
-    <string name="labelCFNRc" msgid="2614827454402079766">"Kad je nedostupno"</string>
+    <string name="labelCFNRc" msgid="2614827454402079766">"Kad je broj nedostupan"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Broj u slučaju nedostupnosti"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Preusmjeravanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Onemogućeno"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Vaš mobilni operater ne podržava onemogućavanje preusmjeravanja poziva ako je vaš telefon nedostupan."</string>
     <string name="updating_title" msgid="6146755386174019046">"Postavke poziva"</string>
     <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">"Postavke poziva (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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="updating_settings" msgid="8171225533884883252">"Ažuriranje postavki..."</string>
@@ -139,7 +141,7 @@
     <string name="disable" msgid="4678348128118573672">"Isključi"</string>
     <string name="change_num" msgid="239476305819844391">"Ažuriraj"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Zdana postavka mreže"</item>
+    <item msgid="5560134294467334594">"Zadana postavka mreže"</item>
     <item msgid="7876195870037833661">"Sakrij broj"</item>
     <item msgid="1108394741608734023">"Prikaži broj"</item>
   </string-array>
@@ -334,7 +336,7 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Postavljanje podatkovne usluge"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Postavke mobil. operatera"</string>
     <string name="fdn" msgid="7878832555095183202">"Brojevi za fiksno biranje"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Brojevi fiksnog biranja (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Fiksno biranje (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Popis FDN-a"</string>
     <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>
@@ -377,7 +379,7 @@
     <string name="fdn_failed" msgid="540018079008319747">"Operacija FDN nije uspjela."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čitanje sa SIM kartice…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nema kontakata na vašoj SIM kartici."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Odaberite kontakte za uvoz"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Odabir kontakata za uvoz"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Isključite način rada u zrakoplovu da biste uvezli kontakte sa SIM kartice."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Omogući/onemogući PIN za SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Promijeni PIN za SIM"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 je trajno blokiran."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Imate još <xliff:g id="NUMBER">%d</xliff:g> pokušaja."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 više nije blokiran"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Pogreška mreže ili SIM kartice"</string>
     <string name="doneButton" msgid="2859593360997984240">"Gotovo"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Broj govorne pošte"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Biranje broja"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Na čekanju"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Prekidanje veze"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Poziv u tijeku"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Biranje broja"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Propušteni poziv"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Propušteni pozivi"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Broj propuštenih poziva: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Propušten poziv kontakta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Poziv u tijeku"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Na čekanju"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Dolazni poziv"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nova govorna pošta"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nova govorna pošta (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Biraj <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nepoznat je broj govorne pošte"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nema usluge"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Odabrana mreža (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) je onemogućena"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Prekini vezu"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Povratni poziv"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Poruka"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Isključite način rada u zrakoplovu da biste uputili poziv."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Isključite način rada u zrakoplovu ili se povežite s bežičnom mrežom da biste uputili poziv."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nije registrirano na mreži."</string>
@@ -548,6 +540,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"biraj"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibracija"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibracija"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Melodija zvona i vibracija"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ugrađene SIM kartice"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index c328b68..7a05634 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonos fiókok"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP-fiók hozzáadása"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Fiókbeállítások konfigurálása"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Az összes telefonos fiók"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Válassza ki, hogy mely fiókokkal lehessen hívást kezdeményezni"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-hívás"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne használja a Wi-Fi-hívást"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne használja a hívássegédet"</string>
@@ -113,13 +115,13 @@
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Átirányítás ide: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Ki"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Szolgáltatója nem támogatja a hívásátirányítás letiltását, ha a  telefon foglalt."</string>
-    <string name="labelCFNRy" msgid="1736067178393744351">"Amikor nem válaszol"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Átirányítási szám, ha nem válaszol"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Amikor nem veszi fel"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Átirányítási szám, ha nem veszi fel"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Átirányítás ide: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Ki"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Szolgáltatója nem támogatja a hívásátirányítás letiltását, ha telefonja nem fogad hívásokat."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"Amikor ki van kapcsolva"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"Átirányítási szám, ha nem elérhető"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Átirányítási szám, ha ki van kapcsolva"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Átirányítás ide: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Kikapcsolva"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Szolgáltatója nem támogatja a hívásátirányítás letiltását, ha a telefon nem érhető el."</string>
@@ -139,7 +141,7 @@
     <string name="disable" msgid="4678348128118573672">"Kikapcsolás"</string>
     <string name="change_num" msgid="239476305819844391">"Frissítés"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Hálózati alapértelmezés"</item>
+    <item msgid="5560134294467334594">"Hálózati alapbeállítás"</item>
     <item msgid="7876195870037833661">"Szám elrejtése"</item>
     <item msgid="1108394741608734023">"Szám megjelenítése"</item>
   </string-array>
@@ -346,7 +348,7 @@
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Fix hívószám letiltása"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Fix hívószám engedélyezése"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Fix hívószámok kezelése"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"PIN kód módosítása a fix hívószámok eléréséhez"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"A fix hívószámok eléréséhez szükséges PIN kód módosítása"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefonszámok listájának kezelése"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Adatvédelem"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Fokozott adatvédelmi mód engedélyezése"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"A PUK2 végleg letiltva."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> próbálkozási lehetősége maradt."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 kód letiltása feloldva"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Hálózattal vagy SIM kártyával kapcsolatos hiba"</string>
     <string name="doneButton" msgid="2859593360997984240">"Kész"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Hangposta száma"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Tárcsázás"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Tartásban"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Megszakítás"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Hívásban"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Tárcsázás"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Nem fogadott hívás"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Nem fogadott hívások"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> nem fogadott hívás"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Nem fogadott hívás: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Hívás folyamatban"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Tartásban"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Bejövő hívás"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Új hangposta"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Új hangpostaüzenet (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> tárcsázása"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"A hangposta száma ismeretlen"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nincs szolgáltatás"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"A kiválasztott hálózat (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nem érhető el"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Hívás befejezése"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Visszahívás"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Üzenet"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Repülős üzemmód kikapcsolása hívás indításához."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Hívás indításához kapcsolja ki a repülős üzemmódot, illetve csatlakozzon egy vezeték nélküli hálózathoz."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nincs regisztrálva a hálózaton."</string>
@@ -458,8 +450,8 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Segélyhívás"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Rádió bekapcsolása..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="5960061579996526883">"Nincs szolgáltatás. Újrapróbálkozás folyamatban…"</string>
-    <string name="dial_emergency_error" msgid="1509085166367420355">"A hívás sikertelen. A(z) <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> szám nem vészhívószám."</string>
-    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"A hívás sikertelen. Tárcsázzon vészhívószámot."</string>
+    <string name="dial_emergency_error" msgid="1509085166367420355">"A hívás sikertelen. A(z) <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> szám nem segélyhívószám."</string>
+    <string name="dial_emergency_empty_error" msgid="9130194953830414638">"A hívás sikertelen. Tárcsázzon segélyhívószámot."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"A tárcsázáshoz használja a billentyűzetet"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tartás"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Befejezés"</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"tárcsázás"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Rezgés"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Rezgés"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Hang"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Csengőhang és rezgés"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Beépített SIM kártyák"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index a9da284..b93dbe2 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Ընտրեք՝ որ հաշիվները կարող են զանգեր կատարել"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Զանգեր Wi-Fi-ի միջոցով"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Չօգտագործել Wi-Fi-ը զանգերի համար"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Չօգտագործել զանգերի օգնականը"</string>
@@ -418,6 +420,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-ն ընդմիշտ արգելափակված է:"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Ձեզ մնացել է <xliff:g id="NUMBER">%d</xliff:g> փորձ:"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"Համարարկվում է"</string>
@@ -428,23 +431,12 @@
     <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_dialing" msgid="2107666444937350731">"Համարարկում է"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Բաց թողնված զանգ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Բաց թողնված զանգեր"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> բաց թողնված զանգ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Բաց թողնված զանգ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-ից"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Ընթացիկ զանգը"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Սպասում"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Մուտքային զանգ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Նոր ձայնային հաղորդագրություն"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Նոր ձայնային նամակ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Զանգել <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Վայր դնել"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Հետ զանգել"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Ուղարկել հաղորդագրություն"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Զանգ կատարելու համար անջատեք ինքնաթիռային ռեժիմը:"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Զանգ կատարելու համար անջատեք ինքնաթիռային ռեժիմը կամ միացեք անլար ցանցին:"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ցանցում գրանցված չէ:"</string>
@@ -551,6 +543,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ձայն"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ձայներանգ &amp; Թրթռոց"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ներկառուցված SIM քարտեր"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 68bdea0..462b68f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Akun ponsel"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Tambahkan akun SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Mengonfigurasi setelan akun"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Semua akun pemanggil"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Pilih akun mana yang dapat melakukan panggilan telepon"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Panggilan Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Jangan gunakan panggilan Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Jangan gunakan asisten panggilan telepon"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 diblokir selamanya."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Tersisa <xliff:g id="NUMBER">%d</xliff:g> upaya lagi."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 tidak lagi diblokir"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Kesalahan jaringan atau kartu SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Selesai"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nomor kotak pesan"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Memanggil"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Ditangguhkan"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Menutup panggilan"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Sedang dalam panggilan"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Memanggil"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Panggilan tak terjawab"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Panggilan tak terjawab"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> panggilan tak terjawab"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Panggilan tak terjawab dari <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Panggilan yang sedang berlangsung"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Ditangguhkan"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Panggilan masuk"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Kotak pesan baru"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Kotak pesan baru (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Telepon <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nomor kotak pesan tidak dikenal"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Tidak ada layanan"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Jaringan yang dipilih (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Akhiri"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Hubungi kembali"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Pesan"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Nonaktifkan mode pesawat untuk melakukan panggilan"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Nonaktifkan mode pesawat atau sambungkan ke jaringan nirkabel untuk melakukan panggilan"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tidak terdaftar pada jaringan."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"panggil"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Getar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Suara"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Getar"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Kartu SIM internal"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 27fd3b2..aa5d0a0 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Símareikningar"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Bæta við SIP-reikningi"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Velja reikningsstillingar"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Allir símtalareikningar"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Velja hvaða reikningar geta hringt símtöl"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi símtöl"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ekki nota Wi-Fi símtöl"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ekki nota símtalaaðstoð"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 er læst fyrir fullt og allt."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> tilraunir eru eftir."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-númer ekki lengur læst"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Villa í símkerfi eða á SIM-korti"</string>
     <string name="doneButton" msgid="2859593360997984240">"Lokið"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Talhólfsnúmer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Hringir"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Í bið"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Leggur á"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Í símtali"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Hringir"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ósvarað símtal"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Ósvöruð símtöl"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ósvöruð símtöl"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Ósvarað símtal frá <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Samtal í gangi"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Í bið"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Símtal berst"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ný skilaboð í talhólfinu"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Ný skilaboð í talhólfinu (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Hringja í <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Talhólfsnúmer ekki þekkt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ekkert símasamband"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valið símkerfi (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ekki tiltækt"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Leggja á"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Hringja til baka"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Skilaboð"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Slökktu á flugstillingu til að hringja."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Slökktu á flugstillingu eða tengstu þráðlausu neti til að hringja."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ekki skráð á símkerfi."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"hringja"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Titringur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Titringur"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Hljóð"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Hringitónn og titringur"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Innbyggð SIM-kort"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c023c2d..1f635d6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Seleziona gli account autorizzati a effettuare chiamate"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Chiamate Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Non utilizzare chiamate Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Non utilizzare assistente chiamate"</string>
@@ -338,9 +340,9 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Imposta servizio dati"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Impostazioni operatore"</string>
     <string name="fdn" msgid="7878832555095183202">"Numeri selezione fissa (FDN)"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Numeri consentiti (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Numeri selezione fissa (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Elenco FDN"</string>
-    <string name="fdn_list_with_label" msgid="7437232552210469217">"Elenco numeri consentiti (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Elenco FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Attivazione FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Numeri di selezione fissa attivi"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Numeri di selezione fissa non attivi"</string>
@@ -416,6 +418,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bloccato definitivamente."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Hai a disposizione ancora <xliff:g id="NUMBER">%d</xliff:g> tentativi."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 sbloccato"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Errore di rete o della SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Fine"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numero segreteria"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Chiamata in corso"</string>
@@ -426,23 +429,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"In attesa"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"In fase di chiusura"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Chiamata"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Chiamata in corso"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chiamata senza risposta"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chiamate senza risposta"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chiamate senza risposta"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Chiamata senza risposta da <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Chiamata in corso"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"In attesa"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Chiamata ricevuta"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuovo msg vocale"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nuovo msg vocale (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Componi <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numero segreteria sconosciuto"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nessun servizio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rete selezionata (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponibile"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Riaggancia"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Richiama"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Messaggio"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Disattiva la modalità aereo per effettuare una chiamata."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Disattiva la modalità aereo o connettiti a una rete wireless per effettuare una chiamata."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Non registrato sulla rete."</string>
@@ -469,7 +461,7 @@
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Chiudi"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tastierino"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"No audio"</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"Aggiungi"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Aggiungi chiamata"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Unisci"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Scambia"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gestisci chiamate"</string>
@@ -549,6 +541,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"componi"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrazione"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrazione"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Suono"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Suoneria e vibrazione"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Schede SIM integrate"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index d08f516..9087e10 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"בחר אילו חשבונות יכולים להתקשר"</string>
     <string name="wifi_calling" msgid="739018212480165598">"‏שיחות ב-Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"‏אל תשתמש בשיחות Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"אל תשתמש באסיסטנט שיחות"</string>
@@ -100,7 +102,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>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"‏PUK2 נחסם לצמיתות."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"נותרו לך עוד <xliff:g id="NUMBER">%d</xliff:g> ניסיונות."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"מחייג"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"מחייג"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"שיחה שלא נענתה"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"שיחות שלא נענו"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> שיחות שלא נענו"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"שיחה שלא נענתה מאת <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"שיחה פעילה"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"בהמתנה"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"שיחה נכנסת"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"דואר קולי חדש"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"דואר קולי חדש (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"‏חייג ‎<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>‎"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"נתק"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"התקשר חזרה"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"שלח הודעה"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"בטל את מצב טיסה כדי לבצע שיחה."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"בטל את מצב טיסה או התחבר לרשת אלחוטית כדי לבצע שיחה."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"לא רשום ברשת."</string>
@@ -551,6 +543,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"צליל"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"רינגטון ורטט"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"‏כרטיסי SIM מובנים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 790c356..b7b75af 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"通話できるアカウントを選択"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi通話"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi発信を使用しない"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"発信アシスタントを使用しない"</string>
@@ -139,7 +141,7 @@
     <string name="disable" msgid="4678348128118573672">"OFFにする"</string>
     <string name="change_num" msgid="239476305819844391">"更新"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"ネットワーク既定"</item>
+    <item msgid="5560134294467334594">"ネットワークのデフォルト"</item>
     <item msgid="7876195870037833661">"番号を非通知"</item>
     <item msgid="1108394741608734023">"番号を通知"</item>
   </string-array>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2は完全にブロックされています。"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"入力できるのはあと<xliff:g id="NUMBER">%d</xliff:g>回です。"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"発信中"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"発信中"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"不在着信"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"不在着信"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"不在着信<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>件"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>さんからの不在着信"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"保留中"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"通話着信"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新しいボイスメール"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"新しいボイスメール(<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>にダイヤル"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"通話終了"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"コールバック"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"メッセージ"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"電話をかけるには機内モードをオフにしてください。"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"電話をかけるには、機内モードをオフにするか無線ネットワークに接続してください。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ご加入の通信サービスがありません"</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"通知音"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"着信音とバイブレーション"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"内蔵のSIMカード"</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index b74e7f2..a29e649 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"აირჩიეთ რომელ ანგარიშს შეეძლება ზარების განხორციელება"</string>
     <string name="wifi_calling" msgid="739018212480165598">"დარეკვა Wi-Fi-ს მეშვეობით"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"არ გამოიყენოს Wi-Fi დარეკვა"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"არ გამოიყენოს ზარის თანაშემწე"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 სამუდამოდ დაიბლოკა."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n" თქვენ გაქვთ <xliff:g id="NUMBER">%d</xliff:g> დარჩენილი მცდელობა."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"აკრეფვა"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"აკრეფვა"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"გამოტოვებული ზარი"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"გამოტოვებული ზარები"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> გამოტოვებული ზარები"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"გამოტოვებული ზარი <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-ისგან"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"მიმდინარე ზარი"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"შეყოვნების რეჟიმში"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"შემომავალი ზარი"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ახალი ხმოვანი ფოსტა"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ახალი ხმოვანი ფოსტა (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>-ზე დარეკვა"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"გათიშვა"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"გადარეკვა"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"შეტყობინების გაგზავნა"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ზარის განსახორციელებლად, გამორთეთ თვითმფრინავის რეჟიმი."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ზარის განსახორციელებლად, გამორთეთ თვითმფრინავის რეჟიმი ან დაუკავშირდით უსადენო ქსელს."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ქსელში რეგისტრირებული არ არის."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ხმა"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ზარის მელოდია &amp; ვიბრაცია"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"ჩაშენებული SIM ბარათები"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 5a3c701..4f67d18 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Қай есептік жазбалардың қоңырау шала алатынын таңдау"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi қоңыраулары"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi қоңырауларын пайдаланбау"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Қоңыраулар көмекшісін пайдаланбау"</string>
@@ -79,7 +81,7 @@
     <string name="wifi_calling_use_call_assistant_summary" msgid="6599987137133339698">"Қолданбаларға немесе қызметтерге қоңыраулар үшін пайдаланылатын желілерді басқаруға мүмкіндік береді"</string>
     <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Конфигурациялау"</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>
@@ -119,7 +121,7 @@
     <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="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>
@@ -139,7 +141,7 @@
     <string name="disable" msgid="4678348128118573672">"Өшіру"</string>
     <string name="change_num" msgid="239476305819844391">"Жаңарту"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Желі бастапқы бойынша"</item>
+    <item msgid="5560134294467334594">"Желінің бастапқы параметрі"</item>
     <item msgid="7876195870037833661">"Нөмірді жасыру"</item>
     <item msgid="1108394741608734023">"Нөмірді көрсету"</item>
   </string-array>
@@ -334,7 +336,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">"ТТН тізімі"</string>
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Бекітілген теру нөмірлерінің тізімі (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Тұрақты теру нөмірлерін қосу"</string>
@@ -412,8 +414,9 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 уақытша бөгелген."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> әрекет қалды."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 енді бөгелмеген"</string>
-    <string name="doneButton" msgid="2859593360997984240">"Орындалды"</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Дауыс хабарының нөмірі"</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="card_title_dialing" msgid="5769417478498348054">"Теруде"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"Қайта терілуде"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Мәжіліс қоңырауы"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"Теру"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Қабылданбаған қоңырау"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Қабылданбаған қоңыраулар"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> қабылданбаған қоңыраулар"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> қоңырауы қабылданбаған"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Ағымдағы қоңырау"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Күтуде"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Келген қоңырау"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Жаңа дауыс хабары"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"(<xliff:g id="COUNT">%d</xliff:g>) дауыс хабары"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> нөмірін теру"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Қоңырауды аяқтау"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Кері қоңырау шалу"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Хабар"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Қоңырау шалу үшін ұшақ режимін өшіріңіз."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Қоңырау шалу үшін ұшақ режимін өшіріңіз не сымсыз желіге қосылыңыз."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Желіде тіркелмеген."</string>
@@ -543,10 +535,12 @@
     <string name="selectContact" msgid="781975788478987237">"контакт таңдау"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Дауыс арқылы қоңырау шалу қолдауы жоқ"</string>
     <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_notification_vibrate_when_title" msgid="8361970092063604886">"Діріл"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Діріл"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Дыбыс"</string>
-    <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон&amp; Тербеліс"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон&amp; Діріл"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Кірістірілген SIM карталары"</string>
     <string name="enable_video_calling_title" msgid="7237253660669000899">"Бейне қоңырауларды қосу"</string>
     <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Бейне қоңырауларды қосу үшін желі параметрлерінде жақсартылған 4G LTE режимін қосу керек."</string>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index af84169..a1474f0 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"ជ្រើសគណនីណាមួយដែលអាចធ្វើការហៅទូរស័ព្ទ"</string>
     <string name="wifi_calling" msgid="739018212480165598">"ការហៅតាម Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"កុំប្រើការហៅតាម Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"កុំប្រើជំនួយការហៅ"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"លេខ​កូដ PUK2 ត្រូវ​បាន​​ទប់ស្កាត់​ជា​អចិន្ត្រៃយ៍។"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"អ្នកនៅសល់ការព្យាយាមបញ្ចូល <xliff:g id="NUMBER">%d</xliff:g> ដងទៀត។"</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"លេខសម្ងាត់ PIN2 មិនត្រូវបានរារាំងទៀតទេ"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"កំហុសស៊ីមកាត ឬបណ្ដាញ។"</string>
     <string name="doneButton" msgid="2859593360997984240">"រួចរាល់"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"លេខ​សារ​ជា​សំឡេង"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"កំពុង​ហៅ"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ហៅ"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"ខកខាន​ទទួល"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ខកខាន​ទទួល"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ខកខាន​ការ​​ទទួល"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"ខកខាន​ទទួល​ពី <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"កំពុង​បន្ត​ការ​ហៅ"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"រង់ចាំ"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"ការ​ហៅ​ចូល"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"សារ​ជា​សំឡេង​ថ្មី"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"សារ​ជា​សំឡេង​ថ្មី (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"ចុច <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"បញ្ចប់​ការ​សន្ទនា"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ហៅ​ទៅ​វិញ"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"សារ"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"បិទរបៀបយន្តហោះដើម្បីធ្វើការហៅ។"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"បិទរបៀបយន្តហោះ ឬភ្ជាប់ទៅបណ្តាញឥតខ្សែដើម្បីធ្វើការហៅ។"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"មិន​បាន​ចុះ​ឈ្មោះ​នៅ​លើ​បណ្ដាញ។"</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"សំឡេង"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"សំឡេង​រោទ៍ &amp; ញ័រ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"ស៊ីមកាត​ជាប់​ជា​មួយ"</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index dc673d8..bde4f04 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -62,13 +62,15 @@
     <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>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"ಮೊದಲು ಕೇಳು"</string>
     <string name="phone_accounts_settings_header" msgid="4141710640883261094">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"ಖಾತೆಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
     <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="wifi_calling" msgid="739018212480165598">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</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_do_not_use" msgid="7491443219113013323">"Wi-Fi ಕರೆ ಮಾಡುವಿಕೆಯನ್ನು ಬಳಸಬೇಡಿ"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ಕರೆ ಸಹಾಯಕವನ್ನು ಬಳಸಬೇಡಿ"</string>
     <string name="wifi_calling_call_assistant_none" msgid="6283702349285593683">"ಯಾವುದೂ ಇಲ್ಲ"</string>
@@ -119,7 +121,7 @@
     <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="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>
@@ -377,7 +379,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>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ಅನ್ನು ಶಾಶ್ವತವಾಗಿ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"ನೀವು <xliff:g id="NUMBER">%d</xliff:g> ಬಾಕಿ ಉಳಿದಿರುವ ಪ್ರಯತ್ನಗಳನ್ನು ಹೊಂದಿರುವಿರಿ."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ಇನ್ನು ಮುಂದೆ ನಿರ್ಬಂಧಿತವಾಗಿರುವುದಿಲ್ಲ"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"ನೆಟ್‌ವರ್ಕ್‌ ಅಥವಾ ಸಿಮ್ ಕಾರ್ಡ್‌ ದೋಷ"</string>
     <string name="doneButton" msgid="2859593360997984240">"ಮುಗಿದಿದೆ"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ಧ್ವನಿಮೇಲ್‌ ಸಂಖ್ಯೆ"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ಡಯಲ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ಡಯಲ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ತಪ್ಪಿದ ಕರೆಗಳು"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ತಪ್ಪಿದ ಕರೆಗಳು"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ಅವರಿಂದ ಮಿಸ್ಡ್‌ ಕಾಲ್‌"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕರೆ"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"ಒಳಬರುವ ಕರೆ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ಹೊಸ ಧ್ವನಿಮೇಲ್‌‌ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ಗೆ ಡಯಲ್‌‌ ಮಾಡು"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"ಹ್ಯಾಂಗ್ ಅಪ್ ಮಾಡಿ"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ಮರಳಿ ಕರೆ ಮಾಡಿ"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"ಸಂದೇಶ"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ಕರೆ ಮಾಡಲು ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ ಅಥವಾ ಕರೆ ಮಾಡಲು ವೈರ್‌ಲೆಸ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ಇನ್ನೂ ನೋಂದಣಿಯಾಗಿಲ್ಲ."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ಧ್ವನಿ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ರಿಂಗ್‌ಟೋನ್‌‌ &amp; ವೈಬ್ರೇಟ್‌"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"ಅಂತರ್-ರಚಿತ ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳು"</string>
@@ -556,7 +550,7 @@
     <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">"ಒಳಬರುವ ವೈ-ಫೈ ಕರೆ"</string>
+    <string name="status_hint_label_incoming_wifi_call" msgid="8772915926382037499">"ಒಳಬರುವ Wi-Fi ಕರೆ"</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>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 84bdbec..ae0d2ae 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -62,12 +62,14 @@
     <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>
+    <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"확인 후 걸기"</string>
     <string name="phone_accounts_settings_header" msgid="4141710640883261094">"설정"</string>
     <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"계정 선택"</string>
     <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_summary" msgid="8594186415822657011">"전화를 걸 수 있는 계정 선택"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi 통화"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi 통화 사용 안함"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"통화 도우미 사용 안함"</string>
@@ -105,22 +107,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="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>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2가 완전히 차단되었습니다."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g>번의 기회가 남았습니다."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"전화 거는 중"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"전화 거는 중"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"부재중 전화"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"부재중 통화"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"부재중 통화 <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>통"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>의 부재중 전화"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"현재 통화"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"대기 중"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"수신 전화"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"새 음성사서함"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"새 음성사서함(<xliff:g id="COUNT">%d</xliff:g>개)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>(으)로 전화걸기"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"전화 끊기"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"통화하기"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"문자 메시지"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"전화를 걸려면 비행기 모드를 사용 중지하세요."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"전화를 걸려면 비행기 모드를 사용 중지하거나 무선 네트워크에 연결하세요."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"네트워크에서 등록되지 않았습니다."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"알림음"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"벨소리 및 진동"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"내장된 SIM 카드"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 41b6aec..fd7a9fe 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -101,6 +101,8 @@
     <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_summary" msgid="8594186415822657011">"Чалуулар жасала турган каттоо эсептерин тандаңыз"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi чалуу"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi чалуу колдонулбасын"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Чалуу жардамчысы колдонулбасын"</string>
@@ -626,6 +628,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 биротоло бөгөттөлдү."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Сизде <xliff:g id="NUMBER">%d</xliff:g> аракет калды."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"Мындан ары PIN2 бөгөттөлбөйт"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Тармак же SIM карта катасы"</string>
     <!-- no translation found for doneButton (2859593360997984240) -->
     <skip />
     <!-- no translation found for voicemail_settings_number_label (8524164258691887790) -->
@@ -645,20 +648,6 @@
     <skip />
     <!-- no translation found for card_title_in_call (6346543933068225205) -->
     <skip />
-    <string name="notification_dialing" msgid="2107666444937350731">"Терилүүдө"</string>
-    <!-- no translation found for notification_missedCallTitle (7554385905572364535) -->
-    <skip />
-    <!-- no translation found for notification_missedCallsTitle (1361677948941502522) -->
-    <skip />
-    <!-- no translation found for notification_missedCallsMsg (4575787816055205600) -->
-    <skip />
-    <!-- no translation found for notification_missedCallTicker (504686252427747209) -->
-    <skip />
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Учурдагы чалуу"</string>
-    <!-- no translation found for notification_on_hold (3480694969511790465) -->
-    <skip />
-    <!-- no translation found for notification_incoming_call (2820429205043529642) -->
-    <skip />
     <!-- no translation found for notification_voicemail_title (8933468752045550523) -->
     <skip />
     <!-- no translation found for notification_voicemail_title_count (4366360747660929916) -->
@@ -671,9 +660,6 @@
     <skip />
     <!-- no translation found for notification_network_selection_text (2607085729661923269) -->
     <skip />
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Телефонду коюу"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Кайра чалуу"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Билдирүү"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Чалуу үчүн учак режимин өчүрүңүз."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Чалуу үчүн учак режимин өчүрүңүз же зымсыз тармакка туташыңыз."</string>
     <!-- no translation found for incall_error_emergency_only (4678640422710818317) -->
@@ -826,6 +812,8 @@
     <skip />
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Титиретүү"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Титиретүү"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Үнү"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Рингтон жана Титирөө"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Кыналган SIM карталар"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 13c16c3..13974d1 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"ເລືອກວ່າ​ຈະ​ໃຫ້​ບັນ​ຊີ​ໃດ​ໂທ"</string>
     <string name="wifi_calling" msgid="739018212480165598">"ການ​ໂທ Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"ຢ່າໃຊ້ການ​ໂທ​ດ້ວຍ Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ຢ່າ​ໃຊ້​ຕົວ​ຊ່ວຍ​ການ​ໂທ"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ຖືກບລັອກຢ່າງຖາວອນແລ້ວ."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"ທ່ານ​ຍັງ​ພະ​ຍາ​ຍາມ​ໄດ້​ອີກ <xliff:g id="NUMBER">%d</xliff:g> ຄັ້ງ."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ບໍ່​ຖືກ​ບ​ລັອກ​ອີກ"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"ເຄືອຂ່າຍ ຫຼື SIM card ຜິດພາດ"</string>
     <string name="doneButton" msgid="2859593360997984240">"ແລ້ວໆ"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ເບີຂໍ້ຄວາມສຽງ"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ກຳລັງໂທ"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ກຳລັງໂທ"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ສາຍທີ່ບໍ່ໄດ້ຮັບ"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ສາຍບໍ່ໄດ້ຮັບ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"ສາຍທີ່ບໍ່ໄດ້ຮັບຈາກ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"ສາຍທີ່ກຳລັງໂທອອກ"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"ພັກສາຍຊົ່ວຄາວ"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"ສາຍໂທເຂົ້າ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ຂໍ້ຄວາມສຽງໃໝ່"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ຂໍ້ຄວາມສຽງໃໝ່ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"ໂທຫາ <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"ວາງສາຍ"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ໂທກັບ"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"ຂໍ້ຄວາມ"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ປິດໂໝດເຄື່ອງບິນເພື່ອເຮັດການໂທ."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ປິດໂໝດເຄື່ອງບິນ ຫຼືເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍໄຮ້ສາຍເພື່ອເຮັດການໂທ."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ບໍ່ໄດ້ລົງທະບຽນໃນເຄືອຂ່າຍ."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ສຽງ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ຣິງໂທນ &amp; ການສັ່ນເຕືອນ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"SIM ກາດ​ທີ່​ມາ​ກັບ​ເຄື່ອງ"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 6cb7487..21baa2d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefono paskyros"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Pridėti SIP paskyrą"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Paskyros nustatymų konfigūravimas"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Visos skambinimo paskyros"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Pasirinkti, iš kurių paskyrų galima skambinti"</string>
     <string name="wifi_calling" msgid="739018212480165598">"„Wi-Fi“ skambinimas"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nenaudoti „Wi-Fi“ skambinimo"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nenaudoti skambučių pagelbiklio"</string>
@@ -137,7 +139,7 @@
     <string name="close_dialog" msgid="2365884406356986917">"Gerai"</string>
     <string name="enable" msgid="7248657275000173526">"Įjungti"</string>
     <string name="disable" msgid="4678348128118573672">"Išjungti"</string>
-    <string name="change_num" msgid="239476305819844391">"Naujinimas"</string>
+    <string name="change_num" msgid="239476305819844391">"Naujinti"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Numatytieji tinklo nustatymai"</item>
     <item msgid="7876195870037833661">"Slėpti numerį"</item>
@@ -376,7 +378,7 @@
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN nebuvo atnaujintas. Įvestas PIN2 kodas buvo netinkamas arba telefono numeris buvo atmestas."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Nepavyko atlikti FDN operacijos."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Skaitoma iš SIM kortelės..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"SIM kortelėje adresatų nėra."</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"SIM kortelėje kontaktų nėra."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Pasirinkti importuojamus adresatus"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Išjunkite lėktuvo režimą, kad galėtumėte importuoti kontaktus iš SIM kortelės."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Įgalinti / išjungti SIM kortelės PIN"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kodas visam laikui užblokuotas."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Liko <xliff:g id="NUMBER">%d</xliff:g> bandym."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 kodas atblokuotas"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Tinklo ar SIM kortelės klaida"</string>
     <string name="doneButton" msgid="2859593360997984240">"Atlikta"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Balso pašto numeris"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Renkamas numeris"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Sulaikyta"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Baigiamas pokalbis"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Skambinant"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Renkamas numeris"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Praleistas skambutis"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Praleisti skambučiai"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> praleisti (-ų) skambučiai (-ų)"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"praleistas skambutis nuo <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Vykstantis pokalbis"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Sulaikyta"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Skambina"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Naujas balso pašto pranešimas"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Naujas balso pašto pranešimas (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Rinkti <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nežinomas balso pašto numeris"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nėra paslaugos"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Pasirinktas tinklas (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) negalimas"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Padėti ragelį"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Perskambinti"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Pranešimas"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Išjunkite lėktuvo režimą, kad galėtumėte skambinti."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Išjunkite lėktuvo režimą arba prisijunkite prie belaidžio ryšio tinklo, kad galėtumėte skambinti."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Neregistruota tinkle."</string>
@@ -551,6 +543,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"rinkti numerį"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibruoti"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibruoti"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Garsas"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Skambėjimo tonas ir vibracija"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Įtaisytosios SIM kortelės"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ee80b25..3d1d594 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Tālruņa konti"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Pievienot SIP kontu"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konta iestatījumu konfigurēšana"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Visi zvanu konti"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Atlasīt kontus, no kuriem var veikt zvanus"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi zvani"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Neizmantot Wi-Fi zvanus"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Neizmantot zvanu palīgu"</string>
@@ -336,7 +338,7 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Datu pakalpojuma iestatīšana"</string>
     <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">"Ierobežotais zvanu saraksts (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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>
@@ -379,7 +381,7 @@
     <string name="fdn_failed" msgid="540018079008319747">"FNSN ievadīšana neizdevās."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Notiek lasīšana no SIM kartes..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartē nav nevienas kontaktpersonas."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Importējamo kontaktpersonu atlasīšana"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Importējamo kontaktu atlase"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Lai importētu kontaktpersonas no SIM kartes, izslēdziet lidojuma režīmu."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Iespējot/atspējot SIM PIN"</string>
     <string name="change_pin" msgid="9174186126330785343">"SIM PIN mainīšana"</string>
@@ -414,6 +416,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kods ir neatgriezeniski bloķēts."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Jums atlikuši <xliff:g id="NUMBER">%d</xliff:g> mēģinājumi."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 vairs nav bloķēts"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Tīkla vai SIM kartes kļūda"</string>
     <string name="doneButton" msgid="2859593360997984240">"Gatavs"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Balss pasta numurs"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Notiek numura sastādīšana"</string>
@@ -424,23 +427,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Aizturēts"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Notiek klausules nolikšana"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Notiek saruna"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Notiek numura sastādīšana"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Neatbildēts zvans"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Neatbildētie zvani"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> neatbildēts(-i) zvans(-i)"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Neatbildēts zvans no: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Pašreizējā saruna"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Aizturēts"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Ienākošs zvans"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Jauns balss pasts"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Jauns balss pasts (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Sastādiet šādu numuru: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Balss pasta numurs nav zināms."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nav pakalpojuma"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Atlasītais tīkls (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nav pieejams"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Pārtraukt"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Atzvanīt"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Ziņojums"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Lai veiktu zvanu, izslēdziet lidojuma režīmu."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Lai veiktu zvanu, izslēdziet lidojuma režīmu vai izveidojiet savienojumu ar bezvadu tīklu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tīklā nav reģistrēts."</string>
@@ -550,6 +542,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"sastādīt numuru"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrozvans"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrozvans"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Signāls"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvana signāls un vibrācija"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Iebūvētās SIM kartes"</string>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index e25a6a8..eb43b27 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Телефонски сметки"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Додајте сметка на СИП"</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_summary" msgid="8594186415822657011">"Изберете кои сметки може да повикуваат"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Повикување преку Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Не користете повикување преку Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Не користете помошник за повикување"</string>
@@ -418,6 +420,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"ПУК2 кодот е трајно блокиран."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Имате уште <xliff:g id="NUMBER">%d</xliff:g> обиди."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"ПИН2-кодот веќе не е блокиран"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Грешка со мрежа или СИМ картичка"</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Број на говорна пошта"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Бирање"</string>
@@ -428,23 +431,12 @@
     <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_dialing" msgid="2107666444937350731">"Бирање"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропуштен повик"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуштени повици"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> пропуштени повици"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуштен повик од <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Тековен повик"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"На чекање"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Дојдовен повик"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова говорна пошта"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова говорна пошта (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Бирај <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Спушти"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Повикува назад"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Порака"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Исклучете го авионскиот режим за да повикате."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Исклучете го авионскиот режим или поврзете се на безжична мрежа за да повикате."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Не е регистриран на мрежа."</string>
@@ -551,6 +543,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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">"Вградени СИМ-картички"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 364199d..f6ce6cd 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"ഫോൺ വിളിക്കാനാകുന്ന അക്കൗണ്ടുകൾ തിരഞ്ഞെടുക്കുക"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi കോളിംഗ്"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi കോൾ ചെയ്യൽ ഉപയോഗിക്കരുത്"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"കോൾ സഹായി ഉപയോഗിക്കരുത്"</string>
@@ -80,7 +82,7 @@
     <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"കോൺഫിഗർ ചെയ്യുക"</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>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"ശബ്ദമെയിൽ(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"നെറ്റ്‌വർക്ക് ഓപ്പറേറ്റർമാർ"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"അടിയന്തര പ്രക്ഷേപണങ്ങൾ"</string>
@@ -108,18 +110,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="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>
@@ -136,7 +138,7 @@
     <string name="radio_off_error" msgid="2304459933248513376">"ഈ ക്രമീകരണങ്ങൾ കാണുന്നതിന് മുമ്പ് റേഡിയോ ഓൺ ചെയ്യുക."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ശരി"</string>
     <string name="enable" msgid="7248657275000173526">"ഓണാക്കുക"</string>
-    <string name="disable" msgid="4678348128118573672">"ഓഫുചെയ്യുക"</string>
+    <string name="disable" msgid="4678348128118573672">"ഓഫ്"</string>
     <string name="change_num" msgid="239476305819844391">"അപ്‌ഡേറ്റ്  ചെയ്യുക"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"സ്ഥിര നെറ്റ്‌വർക്ക്"</item>
@@ -162,8 +164,8 @@
     <string name="registration_done" msgid="495135664535876612">"ഒരു നെറ്റ്‌വർക്കിൽ രജിസ്റ്റർ ചെയ്‌തു."</string>
     <string name="sum_carrier_select" msgid="3494252551249882718">"ഒരു നെ‌റ്റ്‌വർക്ക് ഓപ്പറേറ്ററെ തിരഞ്ഞെടുക്കുക"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"ലഭ്യമായ എല്ലാ നെറ്റ്‌വർക്കുകൾക്കായും തിരയുക"</string>
-    <string name="select_automatically" msgid="5628402124471810174">"യാന്ത്രികമായി തിരഞ്ഞെടുക്കുക"</string>
-    <string name="sum_select_automatically" msgid="5614890115123292400">"താൽപ്പര്യമുള്ള നെറ്റ്‌വർക്ക് യാന്ത്രികമായി തിരഞ്ഞെടുക്കുക"</string>
+    <string name="select_automatically" msgid="5628402124471810174">"സ്വയമേവ തിരഞ്ഞെടുക്കൂ"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"താൽപ്പര്യമുള്ള നെറ്റ്‌വർക്ക് സ്വയമേവ തിരഞ്ഞെടുക്കൂ"</string>
     <string name="register_automatically" msgid="6017849844573519637">"യാന്ത്രിക രജിസ്‌ട്രേഷൻ…"</string>
     <string name="preferred_network_mode_title" msgid="2336624679902659306">"തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് തരം"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"നെറ്റ്‌വർക്ക് ഓപ്പറേറ്റുചെയ്യൽ മോഡ് മാറ്റുക"</string>
@@ -377,7 +379,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">"SIM കാർഡിൽ നിന്ന് കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യാൻ വിമാന മോഡ് ഓഫാക്കുക."</string>
     <string name="enable_pin" msgid="5422767284133234860">"സിം പിൻ പ്രവർത്തനക്ഷമമാക്കുക/പ്രവർത്തനരഹിതമാക്കുക"</string>
     <string name="change_pin" msgid="9174186126330785343">"സിം പിൻ മാറ്റുക"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ശാശ്വതമായി തടഞ്ഞിരിക്കുന്നു."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"നിങ്ങൾക്ക് <xliff:g id="NUMBER">%d</xliff:g> ശ്രമങ്ങൾ ശേഷിക്കുന്നു."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 ഇനി തടയില്ല"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"നെറ്റ്‌വർക്ക് അല്ലെങ്കിൽ സിം കാർഡ് പിശക്"</string>
     <string name="doneButton" msgid="2859593360997984240">"പൂർത്തിയായി"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"വോയ്‌സ്‌മെയിൽ നമ്പർ"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ഡയൽ ചെയ്യുന്നു"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ഡയൽ ചെയ്യുന്നു"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"മിസ്‌ഡ് കോൾ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"മിസ്‌ഡ് കോളുകൾ"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> മിസ്‌ഡ് കോളുകൾ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> എന്നതിൽ നിന്നുള്ള മിസ്‌ഡ് കോൾ"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"കോൾ സജീവമാണ്"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"ഹോള്‍ഡിലാണ്"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"ഇന്‍കമിംഗ് കോള്‍"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"പുതിയ വോയ്‌സ്‌മെയിൽ"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"പുതിയ വോയ്‌സ്‌മെയിൽ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ഡയൽ ചെയ്യുക"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"ഹാംഗ് അപ്പ് ചെയ്യുക"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"കോൾബാക്ക്"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"സന്ദേശം"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ഒരു കോൾ വിളിക്കാൻ വിമാന മോഡ് ഓഫാക്കുക."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ഒരു കോൾ വിളിക്കാൻ വിമാന മോഡ് ഓഫാക്കുക അല്ലെങ്കിൽ വയർലെസ്സ് നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റുചെയ്യുക."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"നെറ്റ്‌വർക്കിൽ രജിസ്റ്റർ ചെയ്‌തിട്ടില്ല."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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">"അന്തർ നിർമ്മിത സിം കാർഡുകൾ"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index a81679f..fc1ec88 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Дуудлага хийх боломжтой бүртгэлээ сонгоно уу"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi дуудлага"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi дуудлагыг бүү ашигла"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Дуудлагын туслагчийг бүү ашигла"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"ПҮК2 бүрмөсөн түгжигдсэн."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Танд <xliff:g id="NUMBER">%d</xliff:g> оролдлого үлдлээ."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"Залгаж байна"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"Залгаж байна"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Аваагүй дуудлага"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Аваагүй дуудлагууд"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> аваагүй дуудлага"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>-н аваагүй дуудлага"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Хийгдэж буй дуудлага"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Хүлээлгэнд"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Ирж буй дуудлага"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Шинэ дуут шуудан"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Шинэ дуут шуудан (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> руу залгах"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Таслах"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Буцааж залгах"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Зурвас"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Дуудлага хийхийн тулд онгоцны горимыг унтраа."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Дуудлага хийхийн тулд онгоцны горимыг унтраа эсвэл утасгүй интернетэд холбогдоно уу."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Сүлжээнд бүртгэгдээгүй."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Дуу"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Хонхны ая &amp; Чичиргээ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Суурилагдсан SIM карт"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 1e8cdaf..64800a4 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -35,7 +35,7 @@
     <string name="audio_mode_speaker" msgid="27649582100085266">"स्पीकर"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"हँडसेट इअरपीस"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"वायर्ड हेडसेट"</string>
-    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ब"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ब्लूटुथ"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"खालील टोन पाठवायचे?\n"</string>
     <string name="pause_prompt_str" msgid="1789964702154314806">"टोन पाठवित आहे\n"</string>
     <string name="send_button" msgid="4106860097497818751">"पाठवा"</string>
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"कोणती खाती कॉल करू शकतात ते निवडा"</string>
     <string name="wifi_calling" msgid="739018212480165598">"वाय-फाय कॉलिंग"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"वाय-फाय कॉल करणे वापरू नका"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"कॉल सहाय्यक वापरू नका"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 कायमचे अवरोधित केले आहे."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"आपल्‍याकडे <xliff:g id="NUMBER">%d</xliff:g> शिल्लक प्रयत्न आहेत."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"पिन2 अवरोधित केला नाही"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"नेटवर्क किंवा सिम कार्ड त्रुटी"</string>
     <string name="doneButton" msgid="2859593360997984240">"पूर्ण झाले"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"व्हॉइसमेल नंबर"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"डायल करीत आहे"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"डायल करीत आहे"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"सुटलेला कॉल"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"सुटलेले कॉल"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> सुटलेले कॉल"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> कडील सुटलेला कॉल"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"सुरू असलेला कॉल"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"होल्ड वर"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"येणारा कॉल"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"नवीन व्हॉइसमेल"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"नवीन व्हॉइसमेल (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> डायल करा"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"हँग अप"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"पुन्हा कॉल करा"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"संदेश"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"कॉल करण्‍यासाठी विमान मोड बंद करा."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"कॉल करण्‍यासाठी विमान मोड बंद करा किंवा वायरलेस नेटवर्कशी कनेक्‍ट करा."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"नेटवर्कवर नोंदणीकृत नाही."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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">"अंगभूत सिम कार्डे"</string>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index c50ec0c..f8c5370 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Akaun telefon"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Tambah akaun SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurasi tetapan akaun"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Semua akaun panggilan"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Pilih akaun yang boleh membuat panggilan"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Panggilan Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Jangan gunakan panggilan Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Jangan gunakan pembantu panggilan"</string>
@@ -154,7 +156,7 @@
     <string name="label_available" msgid="1181658289009300430">"Rangkaian sedia ada"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"Mencari..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Tiada rangkaian ditemui."</string>
-    <string name="search_networks" msgid="1601136049300882441">"Cari dalam rangkaian"</string>
+    <string name="search_networks" msgid="1601136049300882441">"Cari rangkaian"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Ralat ketika mencari rangkaian."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Mendaftar di <xliff:g id="NETWORK">%s</xliff:g>..."</string>
     <string name="not_allowed" msgid="5613353860205691579">"Kad SIM anda tidak membenarkan sambungan ke rangkaian ini."</string>
@@ -207,7 +209,7 @@
     <string name="roaming_enable" msgid="7331106985174381987">"Sambung ke perkhidmatan data apabila melakukan perayauan"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Bersambung ke perkhidmatan data semasa melakukan perayauan"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"Anda telah kehilangan kesambungan data kerana anda meninggalkan rangkaian rumah anda dengan data perayauan dimatikan."</string>
-    <string name="roaming_warning" msgid="1603164667540144353">"Anda boleh dikenakan caj yang ketara."</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>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Pilihan GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Pilihan CDMA"</string>
@@ -375,7 +377,7 @@
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN tidak dikemas kini kerana nombor tidak boleh melebihi 20 digit."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN tidak dikemaskini. PIN2 salah atau nombor telefon telah ditolak."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Operasi FDN gagal."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Membaca dari kad SIM..."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Membaca daripada kad SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Tiada kenalan pada kad SIM anda."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Pilih kenalan untuk diimport"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Matikan mod pesawat untuk mengimport kenalan daripada kad SIM."</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 disekat secara kekal."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Anda mempunyai <xliff:g id="NUMBER">%d</xliff:g> percubaan lagi."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 tidak disekat lagi"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Ralat rangkaian atau kad SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Selesai"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nombor mel suara"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Mendail"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Ditunda"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Menamatkan panggilan"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Dalam panggilan"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Mendail"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Panggilan tidak dijawab"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Panggilan tidak dijawab"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> panggilan tidak dijawab"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Panggilan tidak dijawab daripada <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Panggilan sedang berjalan"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Ditunda"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Panggilan masuk"</string>
-    <string name="notification_voicemail_title" msgid="8933468752045550523">"Mel suara baru"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Mel suara baru (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Mel suara baharu"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Mel suara baharu (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dail <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nombor mel suara tidak dikenali"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Tiada perkhidmatan"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rangkaian pilihan (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Letakkan gagang"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Panggil balik"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesej"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Matikan mod pesawat untuk membuat panggilan."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Matikan mod pesawat atau sambungkan ke rangkaian wayarles untuk membuat panggilan."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tidak didaftarkan pada rangkaian."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"dail"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Getar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Bunyi"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nada dering &amp; Bergetar"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Kad SIM terbina dalam"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 930c146..767f7a7 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"ဖုန်းခေါ်ဆိုနိုင်သည့် အကောင့်များအား ရွေးရန်"</string>
     <string name="wifi_calling" msgid="739018212480165598">"ဝိုင်ဖိုင် ခေါ်ဆိုမှု"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"ကြိုးမဲ့ ခေါ်ဆိုမှုကို မသုံးပါနှင့်"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ခေါ်ဆိုမှု အကူ အသုံးမပြုပါ"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ကို ထာ၀ရ ပိတ်ထားပါသည်"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"သင့်တွင် လက်ကျန် ကြိုးစားခွင့် <xliff:g id="NUMBER">%d</xliff:g> ရှိသည်။"</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"ပင်နံပါတ်2 အား အဆက်မဖြတ်တော့ပါ။"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"ကွန်ရက် သို့မဟုတ် ဆင်းမ်ကဒ်မှားယွင်းမှု"</string>
     <string name="doneButton" msgid="2859593360997984240">"ပြီးပါပြီ"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"အသံစာပို့စနစ်နံပါတ်"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"ဖုန်းခေါ်နေစဉ်"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ဖုန်းခေါ်နေစဉ်"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"လွဲသွားသော ဖုန်းခေါ်မှု"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"လွဲသွားသော ဖုန်းခေါ်မှုများ"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> လွဲသွားသော ဖုန်းခေါ်မှုများ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> က ဖုန်းခေါ်မှုကို မကိုင်မိပါ"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"ဆက်သွားနေသော ဖုန်းခေါ်မှု"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"ခဏ ကိုင်ထားစဉ်"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"အဝင်ခေါ်ဆိုမှု"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"အသံမေးလ်အသစ်"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"အသံစာ အသစ် (<xliff:g id="COUNT">%d</xliff:g>) စောင်"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ကိုခေါ်ပါ"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"ဖုန်းချလိုက်ပါပြီ"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ပြန်ခေါ်ပါ"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"စာတို"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ဖုန်းခေါ်ရန် လေယာဉ်ပျံမုဒ် ပိတ်ထားပါ။"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ဖုန်းခေါ်ရန် လေယာဉ်ပျံမုဒ် ပိတ်ပါ သို့မဟုတ် ကြိုးမဲ့ကွန်ယက်သို့ ချိတ်ဆက်ပါ။"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ကွန်ယက်ပေါ်မှာ မှတ်ပုံတင်မှု မပြုလုပ်ထားပါ"</string>
@@ -545,6 +537,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_notification_ringtone_title" msgid="2609519527849101590">"အသံ"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ဖုန်းမြည်သံ &amp; တုန်ခါသံ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"တပ်ဆင်ပြီး ဆင်းမ် ကဒ်များ"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index d12a556..3c0f95a 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 nummer"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"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>
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefonkontoer"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Legg til SIP-konto"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurer kontoinnstillingene"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Alle ringekontoer"</string>
+    <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="wifi_calling_do_not_use" msgid="7491443219113013323">"Ikke bruk Wi-Fi for å ringe"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ikke bruk ringeassistenten"</string>
@@ -80,7 +82,7 @@
     <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Konfigurer"</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">"Talpostkasse (<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">"Svarer:"</string>
     <string name="networks" msgid="8873030692174541976">"Nettoperatører"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Nødvarsler"</string>
@@ -98,12 +100,12 @@
     <string name="sum_default_caller_id" msgid="1954518825510901365">"La operatøren bestemme om nummeret vises ved utgående samtaler"</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">"Under samtaler, ikke 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">"Innstillinger for videresending av anrop (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Videresending av anrop (<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="messageCFU" msgid="3560082430662923687">"Alltid bruk dette nummeret"</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>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Nummeret er ikke tilgjengelig"</string>
@@ -114,20 +116,20 @@
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Av"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatøren støtter ikke deaktivering av viderekobling når telefonen er opptatt."</string>
     <string name="labelCFNRy" msgid="1736067178393744351">"Når ingen svarer"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Nummer for når det ikke svares"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Nummer når ingen svarer"</string>
     <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="messageCFNRc" msgid="6380695421020295119">"Nummer ved manglende dekning"</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">"Deaktivert"</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">"Anropsinnstillinger (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Anropsvalg (<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 innstillinger …"</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>
@@ -150,7 +152,7 @@
     <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="voicemail_default" msgid="2001233554889016880">"Operatøren din"</string>
-    <string name="mobile_networks" msgid="2843854043339307375">"Mobilnettverksinnstillinger"</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="empty_networks_list" msgid="4249426905018815316">"Fant ingen nettverk."</string>
@@ -339,21 +341,21 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktiver enhet"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Konfigurer datatjeneste"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Operatørinnstillinger"</string>
-    <string name="fdn" msgid="7878832555095183202">"Faste nummer"</string>
+    <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 nummer"</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_activation" msgid="2156479741307463576">"Aktivering av faste nummer"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Kun faste nummer kan ringes"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Faste nummer er deaktivert"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Aktiver faste nummer"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"Slå av faste nummer"</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>
+    <string name="enable_fdn" msgid="3740191529180493851">"Slå på faste numre"</string>
+    <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 nummer"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Aktiver faste nummer"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Vedlikehold liste over faste nummer"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Endre PIN-kode for å styre faste nummer"</string>
-    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Endre liste over telefonnummer"</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="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="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>
@@ -383,7 +385,7 @@
     <string name="fdn_failed" msgid="540018079008319747">"FDN-handlingen mislyktes."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leser fra SIM-kort…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Ingen kontakter på SIM-kortet."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Velg kontakter som skal importeres"</string>
+    <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>
     <string name="enable_pin" msgid="5422767284133234860">"Slå av/på PIN-kode for SIM-kort"</string>
     <string name="change_pin" msgid="9174186126330785343">"Endre PIN-kode for SIM-kort"</string>
@@ -418,6 +420,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 er permanent sperret."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Du har <xliff:g id="NUMBER">%d</xliff:g> forsøk igjen."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"Ringer"</string>
@@ -428,23 +431,12 @@
     <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_dialing" msgid="2107666444937350731">"Slår nummeret"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Tapt anrop"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Tapte anrop"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> tapte anrop"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Tapt anrop fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Pågående samtale"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Parkert"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Innkommende samtale"</string>
-    <string name="notification_voicemail_title" msgid="8933468752045550523">"Nye beskjeder på telefonsvarer"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nye beskjeder på telefonsvarer (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"Nye talemeldinger"</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_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="notification_action_end_call" msgid="6069460915123531620">"Legg på"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring tilbake"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Melding"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Slå av flymodus for å ringe."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Slå av flymodus eller koble til et trådløst nettverk for å ringe."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ikke registrert på nettverket."</string>
@@ -551,6 +543,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 30dde92..3fa91f8 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"कुन खाताहरूले कल गर्न सक्छन् चयन गर्नुहोस्"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi कलिङ"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi कल प्रयोग नगर्नुहोस्"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"कल सहायक प्रयोग नगर्नुहोस्"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 स्थायी रूपमा रोक्का गरियो।"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n" तपाईंसँग <xliff:g id="NUMBER">%d</xliff:g> प्रयास बाँकी छन्।"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"डायल गर्दै"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"डायल गर्ने"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"छुटेका कल"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"छुटेका कल"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> छुटेका कलहरू"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>बाट छुटेका कल"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"चलिरहेको कल"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"होल्डमा"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"आगमन कल"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"नयाँ भ्वाइस मेल"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"नयाँ भ्वाइसमेल ( <xliff:g id="COUNT">%d</xliff:g> )"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>मा डायल गर्नुहोस्"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"छुटाउनुहोस्"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"फेरि कल गर्नुहोस्"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"सन्देश"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"एक कल गर्न हवाइजहाज मोड बन्द गर्नुहोस्।"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"एक कल गर्न हवाइजहाज मोड बन्द गर्नुहोस् वा एक ताररहितको सञ्जालमा जडान गर्नुहोस्।"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"नेटवर्कमा दर्ता भएको छैन।"</string>
@@ -545,6 +537,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_notification_ringtone_title" msgid="2609519527849101590">"आवाज:"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"रिङ्गटोन र भाइब्रेट"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"निर्मित SIM कार्डहरू"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 10b4e58..4d9fc21 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefoonaccounts"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP-account toevoegen"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Accountinstellingen configureren"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Alle oproepaccounts"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selecteer de accounts die kunnen bellen"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Bellen via wifi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Bellen via wifi niet gebruiken"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Oproepassistent niet gebruiken"</string>
@@ -99,8 +101,8 @@
     <string name="labelCW" msgid="6120513814915920200">"Wisselgesprek"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Inkomende oproepen melden als ik aan het bellen ben"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Inkomende oproepen melden als ik aan het bellen ben"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Instellingen voor doorschakelen van oproepen"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Instellingen voor oproepen doorschakelen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Doorschakelinstellingen voor oproepen"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Doorschakelinstellingen voor oproepen (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Oproep doorschakelen"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Altijd doorschakelen"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Altijd dit nummer gebruiken"</string>
@@ -136,7 +138,7 @@
     <string name="radio_off_error" msgid="2304459933248513376">"Schakel de radio in voordat u deze instellingen bekijkt."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="7248657275000173526">"Inschakelen"</string>
-    <string name="disable" msgid="4678348128118573672">"Uitschakelen"</string>
+    <string name="disable" msgid="4678348128118573672">"Uit"</string>
     <string name="change_num" msgid="239476305819844391">"Updaten"</string>
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Netwerkstandaard"</item>
@@ -334,7 +336,7 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Gegevensservice instellen"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Providerinstellingen"</string>
     <string name="fdn" msgid="7878832555095183202">"Vaste nummers"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Fixed Dialing Numbers (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Vaste nummers (FDN, <xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"FDN-lijst"</string>
     <string name="fdn_list_with_label" msgid="7437232552210469217">"FDN-lijst (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"FDN-activering"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-code is definitief geblokkeerd."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"U heeft nog <xliff:g id="NUMBER">%d</xliff:g> pogingen."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 niet langer geblokkeerd"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Netwerk- of simkaartfout"</string>
     <string name="doneButton" msgid="2859593360997984240">"Gereed"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemailnummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Kiezen"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"In de wacht"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Ophangen"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Actieve oproep"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Kiezen"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Gemiste oproep"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepen"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> gemiste oproepen"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Gemiste oproep van <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Actieve oproep"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"In de wacht"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Inkomende oproep"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nieuwe voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nieuwe voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> bellen"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemailnummer onbekend"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Geen service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Geselecteerd netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) niet beschikbaar"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Ophangen"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Terugbellen"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Bericht"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Schakel de vliegtuigmodus uit om te bellen."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Schakel de vliegtuigmodus uit of maak verbinding met een draadloos netwerk om te bellen."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Niet geregistreerd op netwerk."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"bellen"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Trillen"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Trillen"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Geluid"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Beltoon en trillen"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ingebouwde simkaarten"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 5f00996..e8aef69 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"ਚੁਣੋ ਕਿ ਕਿਹੜੇ ਖਾਤੇ ਕਾਲਾਂ ਨੂੰ ਕਰ ਸਕਦੇ ਹਨ"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi ਕਾਲਿੰਗ"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi ਕਾਲਿੰਗ ਨਾ ਵਰਤੋ"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ਕਾਲ ਸਹਾਇਕ ਨਾ ਵਰਤੋ"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ਸਥਾਈ ਤੌਰ ਤੇ ਬਲੌਕ ਕੀਤਾ ਹੋਇਆ ਹੈ।"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="NUMBER">%d</xliff:g> ਕੋਸ਼ਿਸ਼ਾਂ ਬਾਕੀ ਹਨ।"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"ਡਾਇਲ ਕਰ ਰਿਹਾ ਹੈ"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ਡਾਇਲ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"ਮਿਸਡ ਕਾਲ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ਮਿਸਡ ਕਾਲਾਂ"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ਮਿਸਡ ਕਾਲਾਂ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ਵੱਲੋਂ ਮਿਸਡ ਕਾਲ"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"ਜਾਰੀ ਕਾਲ"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"ਹੋਲਡ ਤੇ"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"ਇਨਕਮਿੰਗ ਕਾਲ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ਨਵੀਂ ਵੌਇਸਮੇਲ"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ਨਵੀਂ ਵੌਇਸਮੇਲ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ਡਾਇਲ ਕਰੋ"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"ਹੈਂਗ ਅਪ ਕਰੋ"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"ਕਾਲ ਬੈਕ ਕਰੋ"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"ਸੁਨੇਹਾ"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ ਏਅਰਪਲੇਨ ਮੋਡ ਬੰਦ ਕਰੋ।"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ਏਅਰਪਲੇਨ ਮੋਡ ਬੰਦ ਕਰੋ ਜਾਂ ਇੱਕ ਕਾਲ ਕਰਨ ਲਈ ਇੱਕ ਵਾਇਰਲੈਸ ਨੈਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ।"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ਨੈਟਵਰਕ ਤੇ ਰਜਿਸਟਰ ਨਹੀਂ ਕੀਤਾ।"</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ਅਵਾਜ਼"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ਰਿੰਗਟੋਨ &amp; ਵਾਈਬ੍ਰੇਟ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"ਬਿਲਟ-ਇਨ SIM ਕਾਰਡ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cfde3c7..554f96d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Konta telefonu"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Dodaj konto SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurowanie ustawień konta"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Wszystkie konta telefoniczne"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Wybierz konta, na których można wykonywać połączenia telefoniczne"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Połączenia przez Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nie używaj połączeń Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nie używaj asystenta połączeń"</string>
@@ -110,17 +112,17 @@
     <string name="sum_cfu_disabled" msgid="8384177689501334080">"Wyłączone"</string>
     <string name="labelCFB" msgid="6139853033106283172">"Gdy zajęty"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Przekieruj na numer"</string>
-    <string name="sum_cfb_enabled" msgid="5984198104833116690">"Przekazywanie do <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfb_enabled" msgid="5984198104833116690">"Przekierowanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Wyłączone"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer jest zajęty."</string>
     <string name="labelCFNRy" msgid="1736067178393744351">"Gdy nie odbieram"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Przekieruj na numer"</string>
-    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Przekazywanie do <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Przekierowanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Wyłączone"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer nie odpowiada."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"Gdy niedostępny"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Przekieruj na numer"</string>
-    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Przekazywanie do <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Przekierowanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Wyłączone"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer jest nieosiągalny."</string>
     <string name="updating_title" msgid="6146755386174019046">"Ustawienia połączeń"</string>
@@ -139,7 +141,7 @@
     <string name="disable" msgid="4678348128118573672">"Wyłącz"</string>
     <string name="change_num" msgid="239476305819844391">"Aktualizuj"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Domyślna wartość dla sieci"</item>
+    <item msgid="5560134294467334594">"Domyślne ustawienie sieci"</item>
     <item msgid="7876195870037833661">"Ukryj numer"</item>
     <item msgid="1108394741608734023">"Pokaż numer"</item>
   </string-array>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 został trwale zablokowany."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Masz jeszcze <xliff:g id="NUMBER">%d</xliff:g> prób(y)."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 nie jest już zablokowany"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Błąd sieci lub karty SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Gotowe"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numer poczty głosowej"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Wybieranie"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Oczekujące"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Trwa rozłączanie"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Trwa połączenie"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Trwa wybieranie numeru"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Nieodebrane połączenie"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Połączenia nieodebrane"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> nieodebranych połączeń"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Nieodebrane połączenie z <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Trwa połączenie"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Oczekujące"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Połączenie przychodzące"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nowa poczta głosowa"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nowa poczta głosowa (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Zadzwoń do <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nieznany numer poczty głosowej"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Brak usługi"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Wybrana sieć (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) jest niedostępna"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Rozłącz"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Oddzwoń"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Wiadomość"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Wyłącz tryb samolotowy, by zadzwonić."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Wyłącz tryb samolotowy lub połącz się z siecią bezprzewodową, by zadzwonić."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nie zarejestrowano w sieci"</string>
@@ -551,6 +543,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"wybierz numer"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Wibracje"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Wibracje"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Dźwięk"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Dzwonek i wibracje"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Wbudowane karty SIM"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fd512c1..e736c8f 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Contas do telemóvel"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Adicionar conta SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurar as definições da conta"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Todas as contas de chamadas"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selecionar que contas podem fazer chamadas"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Chamadas Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Não utilizar chamadas de Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Não utilizar o assistente de chamadas"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bloqueado permanentemente."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Tem mais <xliff:g id="NUMBER">%d</xliff:g> tentativas."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"O PIN2 deixou de estar bloqueado"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Erro do cartão SIM ou da rede"</string>
     <string name="doneButton" msgid="2859593360997984240">"Concluído"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número do correio de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"A marcar"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Em espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"A desligar"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"A chamar"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"A marcar"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada não atendida"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas não atendidas"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chamadas não atendidas"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Chamada não atendida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada em curso"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Em espera"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Chamada recebida"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correio de voz"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Novo correio de voz (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Marcar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número do correio de voz desconhecido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nenhum serviço"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) indisponível"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Desligar"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ligar de volta"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensagem"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Desative o modo de avião para fazer uma chamada."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desative o modo de avião ou ligue-se a uma rede sem fios para fazer uma chamada."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Sem registo na rede."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Som"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tocar e Vibrar"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartões SIM incorporados"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1c7e3b8..1041630 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Contas de telefone"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Adicionar conta SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Configurar conta"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Todas as contas de chamadas"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Selecione quais contas podem fazer chamadas"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Chamadas por Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Não usar chamadas por Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Não usar o assistente de chamada"</string>
@@ -125,7 +127,7 @@
     <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>
     <string name="call_settings_primary_user_only" msgid="5679923943740900965">"As configurações de chamada só podem ser alteradas pelo usuário principal."</string>
-    <string name="call_settings_with_label" msgid="89359812614544532">"Configurações de chamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_settings_with_label" msgid="89359812614544532">"Config. de chamada (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Erro de configuração da chamada"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lendo as configurações…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Atualizando configurações…"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 permanentemente bloqueado."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Você tem <xliff:g id="NUMBER">%d</xliff:g> tentativas restantes."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 não mais bloqueado"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Erro de rede ou do cartão SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Concluído"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número correio de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Discando"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Em espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Desligando"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Em chamada"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Discando"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Chamada perdida"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas perdidas"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chamadas perdidas"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada em andamento"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Em espera"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Recebendo chamada"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correio de voz"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Novo correio de voz (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Discar <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número correio de voz desconhecido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sem serviço"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"A rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) não está disponível"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Desligar"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Retornar chamada"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensagem"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Desative o modo avião para fazer uma chamada."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Desative o modo avião ou conecte-se a uma rede sem fio para fazer uma chamada."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Não registrado na rede."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"discar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Som"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Toque e vibração"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Cartões SIM integrados"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b309635..fd6150e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -60,14 +60,16 @@
     <string name="apn_settings" msgid="9043423184895642077">"Numele punctelor de acces"</string>
     <string name="settings_label" msgid="3876743539816984008">"Setări de reţea"</string>
     <string name="phone_accounts" msgid="6376603393888116364">"Conturi pentru apelare"</string>
-    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Efectuați apeluri cu"</string>
-    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Efectuați apeluri SIP cu"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Apelați cu"</string>
+    <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Dați apeluri SIP cu"</string>
     <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Întreabă mai întâi"</string>
     <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Setări"</string>
     <string name="phone_accounts_choose_accounts" msgid="5232948804226424002">"Alegeți conturile"</string>
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Conturi telefon"</string>
     <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="wifi_calling" msgid="739018212480165598">"Apelare prin Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nu folosiți apelarea prin Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nu folosiți un asistent de apelare"</string>
@@ -97,30 +99,30 @@
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numărul afişat în apelurile de ieşire"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizaţi setările prestabilite ale operatorului, pentru a vă afişa numărul în apelurile de ieşire"</string>
     <string name="labelCW" msgid="6120513814915920200">"Apel în aşteptare"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Doresc să fiu notificat despre apelurile de intrare, inclusiv în timpul unui apel"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Doresc să fiu notificat despre apelurile de intrare, inclusiv în timpul unui apel"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Anunță-mă când primesc un apel, inclusiv în timpul unei convorbiri"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Anunță-mă când primesc un apel, inclusiv în timpul unei convorbiri"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Setările pentru redirecţionarea de apeluri"</string>
     <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Setări de redirecționare a apelurilor (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Redirecţionarea apelurilor"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Redirecționează întotdeauna"</string>
-    <string name="messageCFU" msgid="3560082430662923687">"Utilizaţi întotdeauna acest număr"</string>
+    <string name="messageCFU" msgid="3560082430662923687">"Folosește mereu acest număr"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Se redirecţionează toate apelurile"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Se redirecţionează toate apelurile către <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numărul nu este disponibil"</string>
     <string name="sum_cfu_disabled" msgid="8384177689501334080">"Dezactivat"</string>
     <string name="labelCFB" msgid="6139853033106283172">"Când este ocupat"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Număr pentru redirecţionare dacă este ocupat"</string>
-    <string name="sum_cfb_enabled" msgid="5984198104833116690">"Se efectuează redirecţionarea la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfb_enabled" msgid="5984198104833116690">"Se redirecționează la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Dezactivat"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul dvs. este ocupat."</string>
     <string name="labelCFNRy" msgid="1736067178393744351">"Când nu se răspunde"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Număr pentru redirecţionare dacă nu se răspunde"</string>
-    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Se efectuează redirecţionarea la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Se redirecționează la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Dezactivat"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul dvs. nu răspunde."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"Când nu este accesibil"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Număr de redirecţionare dacă telefonul nu este accesibil"</string>
-    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Se efectuează redirecţionarea la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Se redirecționează la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Dezactivat"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul nu este accesibil."</string>
     <string name="updating_title" msgid="6146755386174019046">"Setări apel"</string>
@@ -377,7 +379,7 @@
     <string name="fdn_failed" msgid="540018079008319747">"Operațiunea FDN nu a reușit."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Se citeşte de pe cardul SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nicio persoană în agenda de pe cardul dvs. SIM."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Selectaţi persoanele din agendă care se importă"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Selectați pentru import"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Pentru a importa persoane de contact de pe cardul SIM, dezactivați modul Avion."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activaţi/dezactivaţi codul PIN al cardului SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Schimbaţi codul PIN pentru SIM"</string>
@@ -412,33 +414,23 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"Codul PUK2 este blocat definitiv."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"V-au rămas <xliff:g id="NUMBER">%d</xliff:g> (de) încercări."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"Codul PIN2 nu mai este blocat"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Eroare de rețea sau de card SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Terminat"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Număr mesagerie vocală"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Apelează"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"Se reapelează"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Teleconferinţă"</string>
-    <string name="card_title_incoming_call" msgid="7364539451234646909">"Apel de intrare"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"Apel primit"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Apel încheiat"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"În aşteptare"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Se închide telefonul"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"În timpul apelului"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Apelează"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Apel nepreluat"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Apeluri nepreluate"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> (de) apeluri nepreluate"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Apel nepreluat de la <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Apel în desfăşurare"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"În aşteptare"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Apel de intrare"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Mesaj vocal nou"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Mesaj vocal nou (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Apelați <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Număr mesagerie vocală necunoscut"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Fără serviciu"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Reţeaua selectată (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nu este disponibilă"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Încheiaţi apelul"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Sunaţi înapoi"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesaj"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Pentru a apela, dezactivați modul Avion."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Pentru a apela, dezactivați modul Avion sau conectați-vă la o rețea wireless."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Neînregistrat în reţea."</string>
@@ -548,8 +540,10 @@
     <string name="description_dial_button" msgid="7459705245418435351">"apelare"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibraţii"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibraţii"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sunet"</string>
-    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de sonerie și vibrare"</string>
+    <string name="preference_category_ringtone" msgid="5197960752529332721">"Ton de apel și vibrare"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Carduri SIM încorporate"</string>
     <string name="enable_video_calling_title" msgid="7237253660669000899">"Activați apelurile video"</string>
     <string name="enable_video_calling_dialog_msg" msgid="8948186136957417948">"Pentru a activa apelarea video, trebuie să activați Modul 4G LTE îmbunătățit în setările pentru rețea."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ff68f11..3b8a8a7 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Выберите аккаунты, в которых можно совершать вызовы"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Звонки по Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Не использовать Wi-Fi для звонков"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Не использовать ассистент"</string>
@@ -414,6 +416,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"Код PUK2 заблокирован навсегда"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Осталось попыток: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"Набор номера"</string>
@@ -424,23 +427,12 @@
     <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_dialing" msgid="2107666444937350731">"Набор номера"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропущенный вызов"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропущенные вызовы"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Пропущенных вызовов: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропущенные вызовы от абонента <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Текущий вызов"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"На удержании"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Входящий вызов"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Новое сообщение голосовой почты"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Новое сообщение голосовой почты (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Позвонить <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Завершить разговор"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Позвонить"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Написать"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Чтобы позвонить, отключите режим полета."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Чтобы позвонить, отключите режим полета и подключитесь к Wi-Fi."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Нет регистрации в сети."</string>
@@ -467,7 +459,7 @@
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Завершить"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Кнопки"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Откл. звук"</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"+ вызов"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Добавить вызов"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Соединить"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Перевод звонка"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Управление вызовами"</string>
@@ -553,6 +545,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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>
@@ -562,7 +556,7 @@
     <string name="enable_video_calling_dialog_close" msgid="7411471282167927991">"Закрыть"</string>
     <string name="sim_label_emergency_calls" msgid="4847699229529306397">"Экстренные вызовы"</string>
     <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="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>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index e2d0f9c..277c27c 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"ඇමතුම් සිදු කළ හැකි ගිණුම් තෝරන්න"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi ඇමතීම"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi ඇමතුම භාවිතා කරන්න එපා"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ඇමතුම් සහායක භාවිතා කරන්න එපා"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 සදාකාලිකවම අවහිරයි."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"ඔබට නැවත උත්සාහ කිරීම් <xliff:g id="NUMBER">%d</xliff:g> ක් තිබේ."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"අමතමින්"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"අමතමින්"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"මඟ හැරුණු ඇමතුම"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"මඟ හැරුණු ඇමතුම්"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"මඟ හැරුණු ඇමතුම් <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> වෙතින් මඟ හැරුණු ඇමතුම්"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"කරගෙනය යන ඇමතුම"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"රඳවා ගනිමින්"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"එන ඇමතුම"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"නව හඬතැපෑල"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"නව හඬ තැපැල් (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> අමතන්න"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"විසන්ධි කරන්න"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"නැවත අමතන්න"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"පණිවිඩය"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ඇමතුමක් ගැනීමට ගුවන් යානා මාදිලිය අක්‍රිය කරන්න."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ඇමතුමක් ලබා ගැනීමට ගුවන් යානා මෝඩය අක්‍රිය කරන්න හෝ රැහැන් රහිත ජාලයකට සම්බන්ධ වෙන්න."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ජාලය මත ලියාපදිංචි වී නැත."</string>
@@ -545,6 +537,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_notification_ringtone_title" msgid="2609519527849101590">"ශබ්දය"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"රිගින් ටෝන් සහ කම්පනය කරන්න"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"තිළැලි SIM කාඩ් පත්"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 574d232..ff1ace8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefón"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Tiesňové vytáčanie"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefón"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"Zoznam pevne určených čísiel (FDN)"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"Zoznam povolených čísel"</string>
     <string name="unknown" msgid="6878797917991465859">"Neznáme"</string>
     <string name="private_num" msgid="6713286113000232309">"Súkromné číslo"</string>
     <string name="payphone" msgid="4793877574636445118">"Telefónny automat"</string>
@@ -43,10 +43,10 @@
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nie"</string>
     <string name="wild_prompt_str" msgid="5543521676355533577">"Nahradiť zástupný znak znakom"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Chýba číslo hlasovej schránky"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"Na karte SIM nie je uložené žiadne číslo hlasovej schránky."</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"Na SIM karte nie je uložené žiadne číslo hlasovej schránky."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Pridať číslo"</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"Karta SIM bola odblokovaná. Prebieha odomykanie telefónu..."</string>
-    <string name="label_ndp" msgid="780479633159517250">"Kód PIN odomknutia siete pre kartu SIM"</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"SIM karta bola odblokovaná. Prebieha odomykanie telefónu..."</string>
+    <string name="label_ndp" msgid="780479633159517250">"Kód PIN odomknutia siete pre SIM kartu"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Odomknúť"</string>
     <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Zatvoriť"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"Žiadosť o odomknutie siete..."</string>
@@ -60,7 +60,7 @@
     <string name="apn_settings" msgid="9043423184895642077">"Názvy prístupových bodov"</string>
     <string name="settings_label" msgid="3876743539816984008">"Nastavenia siete"</string>
     <string name="phone_accounts" msgid="6376603393888116364">"Telefónne účty"</string>
-    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Volať pomocou účtu"</string>
+    <string name="phone_accounts_make_calls_with" msgid="1969188078933152231">"Volať pomocou"</string>
     <string name="phone_accounts_make_sip_calls_with" msgid="4677789312053828493">"Uskutočniť hovory SIP pomocou účtu"</string>
     <string name="phone_accounts_ask_every_time" msgid="4346499067149985702">"Najprv sa opýtať"</string>
     <string name="phone_accounts_settings_header" msgid="4141710640883261094">"Nastavenia"</string>
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefónne účty"</string>
     <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="wifi_calling" msgid="739018212480165598">"Volanie cez Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Nepoužívať volanie prostredníctvom siete Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Nepoužívať asistenta hovorov"</string>
@@ -97,10 +99,10 @@
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Číslo je zobrazené v odchádzajúcich hovoroch"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Zobrazenie čísla v odchádzajúcich hovoroch sa bude riadiť predvolenými nastaveniami operátora"</string>
     <string name="labelCW" msgid="6120513814915920200">"Čakajúci hovor"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Oznamuje prichádzajúce hovory aj pri prebiehajúcom hovore"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Oznamuje prichádzajúce hovory aj pri prebiehajúcom hovore"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Nastavenia presmerovania hovorov"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Nastavenia presmerovania hovorov (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Oznamovať prichádzajúce hovory aj pri prebiehajúcom hovore"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Oznamovať prichádzajúce hovory aj pri prebiehajúcom hovore"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"Presmerovanie hovorov"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Presmerovanie hovorov (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Presmerovanie hovorov"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Trvalé presmerovanie"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Vždy používať toto číslo"</string>
@@ -109,12 +111,12 @@
     <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 pri obsadenej linke"</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ď neodpovedám"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Číslo pri neprijatí hovoru"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"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>
@@ -127,12 +129,12 @@
     <string name="call_settings_primary_user_only" msgid="5679923943740900965">"Nastavenia hovorov môže zmeniť iba hlavný používateľ."</string>
     <string name="call_settings_with_label" msgid="89359812614544532">"Nastavenia hovorov (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Chyba nastavení hovorov"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Prebieha načítavanie nastavení..."</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Nastavenia sa načítajú…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Prebieha aktualizácia nastavení..."</string>
     <string name="reverting_settings" msgid="4752151682666912828">"Prebieha vrátenie predchádzajúcich nastavení…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočakávaná odpoveď siete."</string>
-    <string name="exception_error" msgid="7027667130619518211">"Došlo k chybe siete alebo karty SIM."</string>
-    <string name="fdn_check_failure" msgid="18200614306525434">"Nastavenie Pevne určené čísla v aplikácii Telefón je povolené. Z toho dôvodu nefungujú niektoré funkcie volania."</string>
+    <string name="exception_error" msgid="7027667130619518211">"Došlo k chybe siete alebo SIM karty."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"V aplikácii Telefón je zapnutý režim povolených čísel. Z toho dôvodu nefungujú niektoré funkcie volania."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Pred zobrazením nastavení zapnite rádio."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="7248657275000173526">"Zapnúť"</string>
@@ -157,7 +159,7 @@
     <string name="search_networks" msgid="1601136049300882441">"Vyhľadávanie sietí"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Pri vyhľadávaní sietí došlo k chybe."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Prebieha registrácia v sieti <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="5613353860205691579">"Vaša karta SIM nepovoľuje pripojenie k tejto sieti."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Vaša SIM karta nepovoľuje pripojenie k tejto sieti."</string>
     <string name="connect_later" msgid="2308119155752343975">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to znova neskôr."</string>
     <string name="registration_done" msgid="495135664535876612">"Prihlásenie k sieti prebehlo úspešne."</string>
     <string name="sum_carrier_select" msgid="3494252551249882718">"Zvoliť sieťového operátora"</string>
@@ -211,7 +213,7 @@
     <string name="roaming_alert_title" msgid="3654815360303826008">"Povoliť dátový roaming?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Možnosti GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Možnosti CDMA"</string>
-    <string name="throttle_data_usage" msgid="3715677828160555808">"Využitie dát"</string>
+    <string name="throttle_data_usage" msgid="3715677828160555808">"Spotreba dát"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Dáta využité v aktuálnom období"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Obdobie využitia dát"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Pravidlá pre prenosovú rýchlosť"</string>
@@ -333,20 +335,20 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivovať zariadenie"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastaviť dátovú službu"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Nastavenia operátora"</string>
-    <string name="fdn" msgid="7878832555095183202">"Pevne určené čísla"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Pevne určené čísla (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"Zoznam pevne určených čísiel (FDN)"</string>
-    <string name="fdn_list_with_label" msgid="7437232552210469217">"Zoznam pevne určených čísel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="fdn_activation" msgid="2156479741307463576">"Aktivácia pevne určených čísiel (FDN)"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Režim Pevne určené čísla je povolený"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Režim Pevne určené čísla je zakázaný"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Zapnúť pevne určené čísla (FDN)"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"Zakázať režim pevne určené čísla (FDN)"</string>
+    <string name="fdn" msgid="7878832555095183202">"Povolené čísla"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Povolené čísla (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"Zoznam povolených čísel"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Zoznam povolených čísel (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"Aktivácia režimu povolených čísel"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Režim povolených čísel je zapnutý"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Režim povolených čísel je vypnutý"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Zapnúť režim povolených čísel"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"Vypnúť režim povolených čísel"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Zmena kódu PIN2"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"Zakázať režim pevne určené čísla (FDN)"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Zapnúť pevne určené čísla (FDN)"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Umožňuje spravovať Pevne určené čísla"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Umožňuje zmeniť kód PIN pre prístup k pevne určeným číslam (FDN)"</string>
+    <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_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>
@@ -371,17 +373,17 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Odstrániť pevne určené čísla"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Prebieha odstraňovanie pevne určených čísiel..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Pevne určené čísla boli odstránené."</string>
-    <string name="pin2_invalid" msgid="5470854099230755944">"Pevne určené čísla (FDN) neboli aktualizované, pretože ste zadali nesprávny kód PIN."</string>
-    <string name="fdn_invalid_number" msgid="1494755047900009147">"Pevne určené čísla (FDN) neboli aktualizované, pretože číslo nesmie presiahnuť 20 číslic."</string>
-    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Pevne určené čísla (FDN) neboli aktualizované. Kód PIN2 bol nesprávny alebo bolo telefónne číslo odmietnuté."</string>
-    <string name="fdn_failed" msgid="540018079008319747">"Operácia FDN zlyhala."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Prebieha čítanie z karty SIM..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Na karte SIM nie sú žiadne kontakty."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Povolené čísla neboli aktualizované. Zadali ste nesprávny kód PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Povolené čísla neboli aktualizované. Číslo nemôže mať viac ako 20 číslic."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Povolené čísla neboli aktualizované. Kód PIN2 je nesprávny alebo bolo telefónne číslo odmietnuté."</string>
+    <string name="fdn_failed" msgid="540018079008319747">"Operácia s povolenými číslami zlyhala."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Prebieha čítanie zo SIM karty..."</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"Na SIM karte nie sú žiadne kontakty."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Vybrať kontakty na import"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Ak chcete importovať kontakty zo SIM karty, vypnite režim v lietadle."</string>
-    <string name="enable_pin" msgid="5422767284133234860">"Povoliť alebo zakázať kód PIN karty SIM"</string>
-    <string name="change_pin" msgid="9174186126330785343">"Zmeniť PIN karty SIM"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"Kód PIN karty SIM:"</string>
+    <string name="enable_pin" msgid="5422767284133234860">"Povoliť alebo zakázať kód PIN SIM karty"</string>
+    <string name="change_pin" msgid="9174186126330785343">"Zmeniť PIN SIM karty"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"Kód PIN SIM karty:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Pôvodný kód PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Nový kód PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Potvrďte nový kód PIN"</string>
@@ -408,13 +410,14 @@
     <string name="pin2_changed" msgid="3724522579945610956">"Kód PIN2 bol aktualizovaný"</string>
     <string name="label_puk2_code" msgid="4688069961795341948">"Zadajte kód PUK2"</string>
     <string name="fdn_enable_puk2_requested" msgid="4991074891459554705">"Heslo je nesprávne. Kód PIN2 bol zablokovaný. Ak to chcete skúsiť znova, zmeňte kód PIN 2."</string>
-    <string name="puk2_requested" msgid="5831015200030161434">"Heslo je nesprávne. Karta SIM bola uzamknutá. Zadajte kód PUK2."</string>
+    <string name="puk2_requested" msgid="5831015200030161434">"Heslo je nesprávne. SIM karta bola uzamknutá. Zadajte kód PUK2."</string>
     <string name="puk2_blocked" msgid="3150263853077280049">"Kód PUK2 je natrvalo blokovaný."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Zostávajú vám pokusy (počet: <xliff:g id="NUMBER">%d</xliff:g>)"</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"Kód PIN2 už nie je blokovaný"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Došlo k chybe siete alebo SIM karty"</string>
     <string name="doneButton" msgid="2859593360997984240">"Hotovo"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Číslo hlasovej schránky"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Vytáčanie"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Vytáča sa"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"Znova sa vytáča"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenčný hovor"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Prichádzajúci hovor"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Podržaný hovor"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Ukončovanie hovoru"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Prebieha hovor"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Vytáčanie"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Zmeškaný hovor"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Zmeškané hovory"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Zmeškané hovory: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>."</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Zmeškaný hovor od volajúceho <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Prebiehajúci hovor"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Podržaný hovor"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Prichádzajúci hovor"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nová hlasová správa"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nová hlasová správa (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Zavolať hlasovú schránku <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Číslo hlasovej schránky je neznáme"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Žiadny signál"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Vybratá sieť (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie je k dispozícii"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Položiť"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zavolať späť"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Správa"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Ak chcete volať, vypnite režim v lietadle"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Ak chcete volať, vypnite režim v lietadle alebo sa pripojte k bezdrôtovej sieti"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Prihlásenie do siete nebolo úspešné."</string>
@@ -474,7 +466,7 @@
     <string name="onscreenVideoCallText" msgid="4800924186056115442">"Videohovor"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"Importovať"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"Importovať všetko"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"Importovanie kontaktov z karty SIM"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"Importovanie kontaktov z SIM karty"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Import z kontaktov"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Načúvacie pomôcky"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Zapnúť režim kompatibility s načúvacou pomôckou"</string>
@@ -551,6 +543,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"vytáčanie"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrovať"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrovať"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvuk"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Tón zvonenia a vibrovanie"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Vstavané SIM karty"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0ef8d7e..e102923 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Računi telefona"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Dodaj račun SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfiguriranje nastavitev računa"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Vsi računi za klicanje"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Izberite, kateri računi lahko opravljajo klice"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Klicanje prek Wi-Fi-ja"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ne uporabljaj klicanja prek povezave Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ne uporabljaj pomočnika za klicanje"</string>
@@ -100,7 +102,7 @@
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Med klicem me opozori na dohodne klice"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Med klicem me opozori na dohodne klice"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Nastavitve preusmerjanja klicev"</string>
-    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Nastavitve posredovanja klicev (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Nastavitve preusmerjanja klicev (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Preusmerjanje klicev"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Vedno preusmeri"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Vedno uporabi to številko"</string>
@@ -163,7 +165,7 @@
     <string name="sum_carrier_select" msgid="3494252551249882718">"Izbira omrežnega operaterja"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Najdi vsa razpoložljiva omrežja"</string>
     <string name="select_automatically" msgid="5628402124471810174">"Samodejna izbira"</string>
-    <string name="sum_select_automatically" msgid="5614890115123292400">"Samodejna izbira želenega omrežja"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Samodejna izbira prednostnega omrežja"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Samodejna registracija ..."</string>
     <string name="preferred_network_mode_title" msgid="2336624679902659306">"Prednostna vrsta omrežja"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Sprememba načina delovanja omrežja"</string>
@@ -333,20 +335,20 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Vklop naprave"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastavite podatkovni prenos"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Nastavitve operaterja"</string>
-    <string name="fdn" msgid="7878832555095183202">"Zapore odhodnih klicev"</string>
+    <string name="fdn" msgid="7878832555095183202">"Številke za omejeno klicanje"</string>
     <string name="fdn_with_label" msgid="187084204115493366">"Številke za omejeno klicanje (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Seznam FDN"</string>
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Seznam FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktiviranje FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Zapore odhodnih klicev so omogočene"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Zapore odhodnih klicev so onemogočene"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Številke za omejeno klicanje (FDN) so onemogočene"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Omogoči FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Onemogoči FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Sprememba kode PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Onemogoči FDN"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Omogoči FDN"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Upravljanje zapor odhodnih klicev"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Spremeni kodo PIN za dostop FDN"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Spremeni kodo PIN za dostop do FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Upravljanje seznama telefonskih številk"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Zasebnost odzivnika"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Omogoči izboljšane nastavitve zasebnosti"</string>
@@ -377,7 +379,7 @@
     <string name="fdn_failed" msgid="540018079008319747">"Postopek za omejeno klicanje ni uspel."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Branje kartice SIM ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Na kartici SIM ni stikov."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Izberite stike, ki jih želite uvoziti"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Izberite stike za uvoz"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Izklopite način za letalo, če želite uvoziti stike s kartice SIM."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Omogoči/onemogoči PIN kartice SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Spremeni PIN kartice SIM"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"Koda PUK2 je trajno blokirana."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Imate še toliko poskusov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"Koda PIN 2 ni več blokirana"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Napaka omrežja ali kartice SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Dokončano"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Številka glasovne pošte"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Klicanje"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Zadržano"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Prekinitev"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Dohodni klic"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Klicanje"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Neodgovorjeni klic"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Neodgovorjeni klici"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> neodgovorjenih klicev"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Neodgovorjeni klic od <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Aktivni klic"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Zadržano"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Dohodni klic"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nova glasovna pošta"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nova glasovna pošta (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Kliči <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Neznana številka glasovne pošte"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ni storitve"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Izbrano omrežje (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ni na voljo"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Prekinite klic"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Povratni klic"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Sporočilo"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Izklopite način za letalo, če želite opraviti klic."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Izklopite način za letalo ali se povežite v omrežje Wi-Fi, če želite opraviti klic."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ni registrirano v omrežju."</string>
@@ -551,6 +543,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"klicanje"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibriraj"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibriraj"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Zvok"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zvonjenje in vibriranje"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Vgrajene kartice SIM"</string>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 9cbdc2b..c396914 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -31,7 +31,7 @@
     <string name="cancel" msgid="5044513931633602634">"Anulo"</string>
     <string name="enter_input" msgid="1810529547726803893">"Mesazhi USSD duhet të jetë mes karaktereve <xliff:g id="MIN_LEN">%d</xliff:g> dhe <xliff:g id="MAX_LEN">%d</xliff:g>. Provo sërish."</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Menaxho telefonatën-konferencë"</string>
-    <string name="ok" msgid="3811371167865772377">"Në rregull!"</string>
+    <string name="ok" msgid="3811371167865772377">"Në rregull"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Altoparlant"</string>
     <string name="audio_mode_earpiece" msgid="4156527186373869107">"Kufje për vesh"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kufje me tel"</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">"Hiq dorë"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Refuzo"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"Po kërkon shkyçjen e rrjetit…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Kërkesa për shkyçjen e rrjetit ishte e pasuksesshme."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Shkyçja e rrjetit ishte e suksesshme."</string>
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Llogari telefoni"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Shto llogari SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfiguro cilësimet e llogarisë"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Të gjitha llogaritë e telefonatave"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Zgjidh se cilat llogari mund të kryejnë telefonata"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Telefonatë me Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Mos përdor \"Telefonatë nga Wi-Fi\""</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Mos përdor \"Ndihmësin e telefonatës\""</string>
@@ -105,22 +107,22 @@
     <string name="labelCFU" msgid="8147177368148660600">"Transfero gjithmonë"</string>
     <string name="messageCFU" msgid="3560082430662923687">"Përdor gjithmonë këtë numër"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Po transferon të gjitha telefonatat"</string>
-    <string name="sum_cfu_enabled" msgid="2450052502198827927">"Po transferon të gjitha telefonatat te <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="sum_cfu_enabled" msgid="2450052502198827927">"Transferim i të gjitha telefonatave te <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <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">"Llogarit kur është i zënë"</string>
-    <string name="sum_cfb_enabled" msgid="5984198104833116690">"Po transferon te <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="messageCFB" msgid="3711089705936187129">"Numri, nëse është i 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">"Llogarit kur nuk ka përgjigje"</string>
-    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Po transferon te <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Numri, nëse s\'ka përgjigje"</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">"Llogarit kur është i paarritshëm"</string>
-    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Po transferon te <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Numri, nëse është i paarritshëm"</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>
     <string name="updating_title" msgid="6146755386174019046">"Cilësimet e telefonatës"</string>
@@ -132,14 +134,14 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Po rikthen cilësimet…"</string>
     <string name="response_error" msgid="6674110501330139405">"Përgjigje e papritur nga rrjeti."</string>
     <string name="exception_error" msgid="7027667130619518211">"Gabim në rrjet ose në kartën SIM."</string>
-    <string name="fdn_check_failure" msgid="18200614306525434">"Cilësimet e numrave me formim fiks të aplikacionit të telefonit tënd janë aktivizuar. Si rezultat, disa funksione që lidhen me telefonatën nuk funksionojnë."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Cilësimet e numrave fiks të aplikacionit të telefonit tënd janë aktivizuar. Si rezultat, disa funksione që lidhen me telefonatën nuk funksionojnë."</string>
     <string name="radio_off_error" msgid="2304459933248513376">"Aktivizo radion para se të shohësh këto cilësime."</string>
-    <string name="close_dialog" msgid="2365884406356986917">"Në rregull!"</string>
+    <string name="close_dialog" msgid="2365884406356986917">"Në rregull"</string>
     <string name="enable" msgid="7248657275000173526">"Aktivizo"</string>
     <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">"Rrjet i parazgjedhur"</item>
+    <item msgid="5560134294467334594">"I parazgjedhur nga rrjeti"</item>
     <item msgid="7876195870037833661">"Fshih numrin"</item>
     <item msgid="1108394741608734023">"Shfaq numrin"</item>
   </string-array>
@@ -208,7 +210,7 @@
     <string name="roaming_disable" msgid="1843417228755568110">"Lidhu me shërbimin e të dhënave kur je në roaming"</string>
     <string name="roaming_reenable_message" msgid="8913735676127858115">"E humbët lidhjen e të dhënave sepse sapo latë rrjetin e vendit tuaj dhe tani jeni me të dhëna roaming-u, të cilat ende nuk janë aktivizuar."</string>
     <string name="roaming_warning" msgid="1603164667540144353">"Mund të shkaktohen tarifa të larta."</string>
-    <string name="roaming_alert_title" msgid="3654815360303826008">"Të lejohen të dhënat e roaming-ut?"</string>
+    <string name="roaming_alert_title" msgid="3654815360303826008">"Të lejohet përdorimi i të dhënave kur je në roaming?"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opsionet GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opsionet CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Përdorimi i të dhënave"</string>
@@ -218,9 +220,9 @@
     <string name="throttle_help" msgid="243651091785169900">"Mëso më shumë"</string>
     <string name="throttle_status_subtext" msgid="1657318943142085170">"<xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) nga maksimumi i periudhës prej <xliff:g id="USED_2">%3$s</xliff:g> \nPeriudha tjetër fillon për <xliff:g id="USED_3">%4$d</xliff:g> ditë (<xliff:g id="USED_4">%5$s</xliff:g>)"</string>
     <string name="throttle_data_usage_subtext" msgid="6029276011123694701">"<xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) nga maksimumi i periudhës prej <xliff:g id="USED_2">%3$s</xliff:g>"</string>
-    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"U kapërcye maksimumi i <xliff:g id="USED_0">%1$s</xliff:g>\nShpejtësia e të dhënave u pakësua deri në <xliff:g id="USED_1">%2$d</xliff:g> kilobit/sek."</string>
+    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"U kapërcye maksimumi i <xliff:g id="USED_0">%1$s</xliff:g>\nShpejtësia e të dhënave u pakësua deri në <xliff:g id="USED_1">%2$d</xliff:g> Kb/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Ka kaluar <xliff:g id="USED_0">%1$d</xliff:g>٪ të ciklit\nPeriudha tjetër fillon për <xliff:g id="USED_1">%2$d</xliff:g> ditë (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
-    <string name="throttle_rate_subtext" msgid="2149102656120726855">"Shpejtësia e të dhënave pakësohet në <xliff:g id="USED">%1$d</xliff:g> kilobit/sek. nëse tejkalohet kufiri i përdorimit të të dhënave"</string>
+    <string name="throttle_rate_subtext" msgid="2149102656120726855">"Shpejtësia e të dhënave pakësohet në <xliff:g id="USED">%1$d</xliff:g> Kb/s nëse tejkalohet kufiri i përdorimit të të dhënave"</string>
     <string name="throttle_help_subtext" msgid="3633091498168446044">"Më shumë informacion rreth politikës së përdorimit të të dhënave të rrjetit celular të operatorit tënd"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS-ja e \"Transmetimit celular\""</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS-ja e transmetimit celular"</string>
@@ -333,19 +335,19 @@
     <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 me formim fiks"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Numrat me formim fiks (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</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 me formim fiks u aktivizuan"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Numrat me formim fiks u çaktivizuan"</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="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 me formim fiks"</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_manage_list" msgid="8431088265332628316">"Menaxho listën e numrave të telefonit"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Privatësia e zërit"</string>
@@ -362,23 +364,23 @@
     <string name="name" msgid="7329028332786872378">"Emri"</string>
     <string name="number" msgid="7905950798349903858">"Numri"</string>
     <string name="save" msgid="4094274636321939086">"Ruaj"</string>
-    <string name="add_fdn_contact" msgid="2481915899633353976">"Shto numër me formim fiks"</string>
-    <string name="adding_fdn_contact" msgid="7627379633721940991">"Po shton numër me formim fiks…"</string>
-    <string name="fdn_contact_added" msgid="7458335758501736665">"Numri me formim fiks u shtua."</string>
-    <string name="edit_fdn_contact" msgid="7976936035587081480">"Redakto numrin me formim fiks"</string>
-    <string name="updating_fdn_contact" msgid="8370929876849803600">"Po përditëson numrin me formim fiks…"</string>
-    <string name="fdn_contact_updated" msgid="5497828782609005017">"Numri me formim fiks u përditësua."</string>
-    <string name="delete_fdn_contact" msgid="6668958073074151717">"Fshije numrin me formim fiks"</string>
-    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Po fshin numrin me formim fiks…"</string>
-    <string name="fdn_contact_deleted" msgid="7154162327112259569">"Numri me formim fiks u fshi."</string>
+    <string name="add_fdn_contact" msgid="2481915899633353976">"Shto numrin me telefonim të përzgjedhur"</string>
+    <string name="adding_fdn_contact" msgid="7627379633721940991">"Po shton numrin me telefonim të përzgjedhur..."</string>
+    <string name="fdn_contact_added" msgid="7458335758501736665">"Numri me telefonim të përzgjedhur u shtua."</string>
+    <string name="edit_fdn_contact" msgid="7976936035587081480">"Redakto numrin me telefonim të përzgjedhur"</string>
+    <string name="updating_fdn_contact" msgid="8370929876849803600">"Po përditëson numrin me telefonim të përzgjedhur..."</string>
+    <string name="fdn_contact_updated" msgid="5497828782609005017">"Numri me telefonim të përzgjedhur u përditësua."</string>
+    <string name="delete_fdn_contact" msgid="6668958073074151717">"Fshi numrin me telefonim të përzgjedhur"</string>
+    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Po fshin numrin me telefonim të përzgjedhur..."</string>
+    <string name="fdn_contact_deleted" msgid="7154162327112259569">"Numri me telefonim të përzgjedhur u fshi."</string>
     <string name="pin2_invalid" msgid="5470854099230755944">"FDN-ja nuk u përditësua sepse shkrove një PIN të pasaktë."</string>
     <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN-ja nuk ishte i përditësuar sepse numri nuk mund të kalojë 20 shifra."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN-ja nuk u përditësua. PIN2-shi ishte i pasaktë ose numri i telefonit u refuzua."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Operacioni FDN dështoi"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Po lexon nga karta SIM..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Nuk ka kontakte në kartën tënde SIM."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Përzgjidh kontakte për të importuar"</string>
-    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Çaktivizo modalitetin \'në aeroplan\" për të importuar kontaktet nga karta SIM."</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"S\'ka kontakte në kartën SIM."</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Zgjidh kontaktet për importim"</string>
+    <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Çaktivizo modalitetin e aeroplanit për të importuar kontaktet nga karta SIM."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Aktivizo/çaktivizo PIN-in e kartës SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Ndrysho PIN-in e kartës SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN-i i kartës SIM:"</string>
@@ -412,9 +414,10 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-shi është i bllokuar përgjithmonë."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Të kanë mbetur edhe <xliff:g id="NUMBER">%d</xliff:g> përpjekje."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2-shi nuk është më i bllokuar"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Gabim në rrjet ose në kartën SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"U krye!"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numri i postës zanore"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Formimi i numrit"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Po telefonon"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"Po riformon numrin"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonatë konference"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Telefonatë hyrëse"</string>
@@ -422,25 +425,14 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Në pritje"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Mbyllja"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Në telefonatë"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Po formon numrin"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Telefonatë e humbur"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Telefonata të humbura"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> telefonata të humbura"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Telefonatë e humbur nga <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Telefonatë në vazhdim"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Në pritje"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Telefonatë hyrëse"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Postë e re zanore"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Postë e re zanore (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Formo numrin <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numri i postës zanore është i panjohur"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nuk ka shërbim"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rrjeti i përzgjedhur (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nuk mundësohet"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Mbyll"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ri-telefono"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesazh"</string>
-    <string name="incall_error_power_off" msgid="2947938060513306698">"Çaktivizo modalitetin \"në aeroplan\" për të bërë një telefonatë."</string>
-    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Çaktivizo modalitetin \"në aeroplan\" ose lidhu me një rrjet me valë për të bërë një telefonatë."</string>
+    <string name="incall_error_power_off" msgid="2947938060513306698">"Çaktivizo modalitetin e aeroplanit për të bërë telefonata."</string>
+    <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Çaktivizo modalitetin e aeroplanit ose lidhu me ndonjë rrjet interneti valor për të bërë telefonata."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"I paregjistruar në rrjet."</string>
     <string name="incall_error_out_of_service" msgid="4100065333878929223">"Rrjeti celular nuk mundësohet."</string>
     <string name="incall_error_out_of_service_wfc" msgid="323851839058697057">"Rrjeti celular nuk mundësohet. Lidhu me një rrjet me valë për të bërë një telefonatë."</string>
@@ -511,7 +503,7 @@
     <string name="ota_spc_failure" msgid="3909983542575030796">"DËSHTIME TË SHUMTA SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Prapa"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Provo sërish"</string>
-    <string name="ota_next" msgid="3904945374358235910">"Tjetër"</string>
+    <string name="ota_next" msgid="3904945374358235910">"Përpara"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Hyri në modalitetin e \"Kthimit të telefonatës së urgjencës\""</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modaliteti i \"Kthimit të telefonatës së urgjencës\""</string>
@@ -532,7 +524,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">"Hiq dorë"</string>
+    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Refuzo"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Shërbimi"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Konfigurimi"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;I pavendosur&gt;"</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"formo numrin"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Dridhja"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Dridhja"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Tingulli"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Me zile dhe me dridhje"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Kartat e integruara SIM"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 21fb465..054c4ce 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Изаберите који налози могу да обављају позиве"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Позивање преко Wi-Fi-ја"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Не користи Wi-Fi позивање"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Не користи помоћника за позиве"</string>
@@ -110,24 +112,24 @@
     <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="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>
     <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="error_updating_title" msgid="7970259216988931777">"Грешка у подешавањима позива"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Учитавање подешавања…"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Подешавања се учитавају…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Ажурирање подешавања…"</string>
     <string name="reverting_settings" msgid="4752151682666912828">"Враћање подешавања…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неочекивани одговор мреже."</string>
@@ -347,7 +349,7 @@
     <string name="disable_fdn_ok" msgid="5727046928930740173">"Омогући број за фиксно бирање"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Управљање фиксним бираним бројевима"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Промени PIN за приступ броју за фиксно бирање"</string>
-    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Управљање листе телефонских бројева"</string>
+    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Управљање листом телефонских бројева"</string>
     <string name="voice_privacy" msgid="3776841382844614716">"Приватност гласа"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Омогући побољшан режим приватности"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY режим"</string>
@@ -375,7 +377,7 @@
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Број за фиксно бирање није ажуриран јер број не сме да премашује 20 цифара."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN није ажуриран. PIN2 је нетачан или је број телефона одбачен."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Радња са бројем за фиксно бирање није успела."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Читање са SIM картице…"</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Чита се са SIM картице…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Нема контаката на SIM картици."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Избор контаката за увоз"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Искључите режим рада у авиону да бисте увезли контакте са SIM картице."</string>
@@ -412,9 +414,10 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 је трајно блокиран."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Имате још <xliff:g id="NUMBER">%d</xliff:g> покушаја."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"Позивање"</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>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Долазни позив"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"Бирање"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропуштен позив"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуштени позиви"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Број пропуштених позива: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуштен позив од: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Актуелни позив"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"На чекању"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Долазни позив"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова говорна пошта"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова говорна пошта (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Позови <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Прекини везу"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Узврати позив"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Порука"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Искључите режим рада у авиону да бисте упутили позив."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Искључите режим рада у авиону или се повежите на бежичну мрежу да бисте упутили позив."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Није регистровано на мрежи."</string>
@@ -548,6 +540,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Мелодија звона и вибрација"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Уграђене SIM картице"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fa459f6..9a3e28e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Konton på mobilen"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Lägg till SIP-konto"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Konfigurera kontoinställningar"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Alla konton för samtal"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Välj vilka konton som kan ringa samtal"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi-samtal"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Använd inte Wi-Fi-samtal"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Använd inte samtalsassistent"</string>
@@ -114,12 +116,12 @@
     <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>
     <string name="labelCFNRy" msgid="1736067178393744351">"När jag inte svarar"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Nummer vid ej svar"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Använd nummer"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Vidarebefordrar till <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öder inte inaktivering av vidarebefordran av samtal när du inte svarar i telefonen."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"När jag inte kan nås"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"Nummer när du inte är tillgänglig"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Använd nummer"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Vidarebefordrar till <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Inaktiverat"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatören stöder inte inaktivering av vidarebefordran av samtal när det inte går att nå telefonen."</string>
@@ -418,6 +420,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK-kod 2 har blockerats permanent."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Du har <xliff:g id="NUMBER">%d</xliff:g> försök kvar."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 är inte längre blockerad"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Nätverks- eller SIM-kortsfel"</string>
     <string name="doneButton" msgid="2859593360997984240">"Färdig"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer till röstbrevlåda"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Ringer"</string>
@@ -428,23 +431,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Parkerat"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lägger på"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"I samtal"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Ringer"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Missat samtal"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missade samtal"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> missade samtal"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Missat samtal från <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Pågående samtal"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Parkerat"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Inkommande samtal"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nytt röstmeddelande"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Nytt röstmeddelande (<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">"Nummer till röstbrevlåda okänt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen tjänst"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Det valda nätverket (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) är inte tillgängligt"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Lägg på"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring upp"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Meddelande"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Inaktivera flygplansläget om du vill ringa."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Inaktivera flygplansläget eller anslut till ett trådlöst nätverk om du vill ringa."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Inte registrerat på nätverk."</string>
@@ -551,6 +543,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"ring upp"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrera"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrera"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ljud"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringsignal och vibrera"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Inbyggda SIM-kort"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8cbbcb9..41cc462 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Akaunti za simu"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Ongeza akaunti ya SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Sanidi mipangilio ya akaunti"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Akaunti zote za simu"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Chagua akaunti ambazo zinaweza kupiga simu"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Upigaji simu kwa Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Usitumie upigaji simu kwa Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Usitumie kisaidizi cha simu"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 Imezuiwa kabisa."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Una majaribio <xliff:g id="NUMBER">%d</xliff:g> yaliyobaki."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 sasa haijazuiwa"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Hitilafu ya Mtandao au SIM kadi"</string>
     <string name="doneButton" msgid="2859593360997984240">"Kwisha"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nambari ya ujumbe wa sauti"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Inapiga"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Inangoja"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Kukata simu"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Katika simu"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Inapiga"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Simu isiyojibiwa"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Simu zisizojibiwa"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> simu ambazo hazijajibiwa"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Simu isiyojibiwa kutoka <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Simu inayoendelea"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Inangoja"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Simu inayoingia"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ujumbe mpya wa sauti"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Barua mpya ya sauti <xliff:g id="COUNT">%d</xliff:g>"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Piga <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nambari ya ujumbe wa sauti haijulikani."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Hakuna huduma"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Mtandao uliochaguliwa <xliff:g id="OPERATOR_NAME">%s</xliff:g> haupatikani"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Kata simu"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Mpigie"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Ujumbe"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Zima hali ya ndegeni ili upige simu."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Zima hali ya ndegeni au uunganishe kwenye mtandao pasiwaya ili upige simu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Haijasajiliwa kwa mitandao"</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"piga simu"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Mtetemo"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mtetemo"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Sauti"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Mlio wa simu na Mtetemo"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"SIM kadi zilizojengewa ndani"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 1076a6d..351713c 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"அழைப்புகள் செய்வதற்கான கணக்குகளைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="wifi_calling" msgid="739018212480165598">"வைஃபை அழைப்பு"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"வைஃபை அழைப்பைப் பயன்படுத்தாதே"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"அழைப்பு உதவியைப் பயன்படுத்தாதே"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 தற்காலிகமாகத் தடுக்கப்பட்டது."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"நீங்கள் <xliff:g id="NUMBER">%d</xliff:g> முறை முயற்சிக்கலாம்."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 இனி தடுக்கப்படாது"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"நெட்வொர்க் அல்லது சிம் கார்டு பிழை"</string>
     <string name="doneButton" msgid="2859593360997984240">"முடிந்தது"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"குரலஞ்சல் எண்"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"டயல் செய்கிறது"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"அழைக்கிறது"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"தவறிய அழைப்பு"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"தவறிய அழைப்புகள்"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> தவறிய அழைப்புகள்"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> இடமிருந்து தவறிய அழைப்பு"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"செயலில் இருக்கும் அழைப்பு"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"காத்திருப்பில்"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"உள்வரும் அழைப்பு"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"புதிய குரலஞ்சல்"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"புதிய குரலஞ்சல் (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ஐ அழை"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"துண்டி"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"திருப்பி அழை"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"செய்தி"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"அழைக்க, விமானப் பயன்முறையை முடக்கவும்."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"அழைக்க, விமானப் பயன்முறையை முடக்கவும் அல்லது வயர்லெஸ் நெட்வொர்க்குடன் இணைக்கவும்."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"நெட்வொர்க்கில் பதிவுசெய்யப்படவில்லை."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ஒலி"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"ரிங்டோன் &amp; அதிர்வு"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"உள்ளமைந்த சிம் கார்டுகள்"</string>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index d050923..20b6023 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"ఏ ఖాతాల నుండి కాల్‌లు చేయవచ్చనే దాన్ని ఎంచుకోండి"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi కాలింగ్"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi కాలింగ్‌ను ఉపయోగించవద్దు"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"కాల్ సహాయకాన్ని ఉపయోగించవద్దు"</string>
@@ -333,13 +335,13 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"పరికరాన్ని సక్రియం చేయండి"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"డేటా సేవను సెటప్ చేయండి"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"క్యారియర్ సెట్టింగ్‌లు"</string>
-    <string name="fdn" msgid="7878832555095183202">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లు"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లు (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn" msgid="7878832555095183202">"ఫిక్సెడ్ డయలింగ్ నంబర్‌లు"</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>
-    <string name="fdn_enabled" msgid="5238109009915521240">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లు ప్రారంభించబడ్డాయి"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"ఫిక్స్‌డ్ డయలింగ్ నంబర్‌లు నిలిపివేయబడ్డాయి"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"ఫిక్సెడ్ డయలింగ్ నంబర్‌లు ప్రారంభించబడ్డాయి"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"ఫిక్సెడ్ డయలింగ్ నంబర్‌లు నిలిపివేయబడ్డాయి"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"FDNని ప్రారంభించు"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"FDNని నిలిపివేయి"</string>
     <string name="change_pin2" msgid="2153563695382176676">"PIN2ని మార్చు"</string>
@@ -377,7 +379,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>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 శాశ్వతంగా బ్లాక్ చేయబడింది."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"మీకు <xliff:g id="NUMBER">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"డయల్ చేస్తోంది"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"డయల్ చేస్తోంది"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"సమాధానం ఇవ్వని కాల్"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"సమాధానం ఇవ్వని కాల్‌లు"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> సమాధానం ఇవ్వని కాల్‌లు"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> నుండి సమాధానం ఇవ్వని కాల్"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"కాల్ కొనసాగుతోంది"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"హోల్డ్‌లో ఉంది"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"ఇన్‌కమింగ్ కాల్"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"కొత్త వాయిస్ మెయిల్"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"కొత్త వాయిస్ మెయిల్ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>కు డయల్ చేయండి"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"కాల్‌ను ముగించు"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"తిరిగి కాల్ చేయి"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"సందేశం"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"కాల్ చేయడానికి ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"కాల్ చేయడానికి ఎయిర్‌ప్లైన్ మోడ్‌ను ఆఫ్ చేయండి లేదా వైర్‌లెస్ నెట్‌వర్క్‌కు కనెక్ట్ చేయండి."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"నెట్‌వర్క్‌లో నమోదు కాలేదు."</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"ధ్వని"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"రింగ్‌టోన్ &amp; వైబ్రేట్"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"అంతర్నిర్మిత SIM కార్డులు"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index fad1666..5d525a5 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"เลือกบัญชีที่สามารถโทรออก"</string>
     <string name="wifi_calling" msgid="739018212480165598">"การโทรผ่าน Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"ไม่ใช้การโทรผ่าน Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"ไม่ใช้ผู้ช่วยโทร"</string>
@@ -127,7 +129,7 @@
     <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="error_updating_title" msgid="7970259216988931777">"ข้อผิดพลาดในการตั้งค่าการโทร"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"กำลังอ่านการตั้งค่า…"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"กำลังประมวลการตั้งค่า…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"กำลังอัปเดตการตั้งค่า..."</string>
     <string name="reverting_settings" msgid="4752151682666912828">"กำลังย้อนกลับการตั้งค่า…"</string>
     <string name="response_error" msgid="6674110501330139405">"พบการตอบกลับที่ไม่คาดหมายจากเครือข่าย"</string>
@@ -376,8 +378,8 @@
     <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_empty" msgid="5270660846489561932">"ไม่มีรายชื่อติดต่อในซิมการ์ด"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"เลือกรายชื่อที่จะนำเข้า"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"ปิดโหมดบนเครื่องบินเพื่อนำเข้ารายชื่อติดต่อจากซิมการ์ด"</string>
     <string name="enable_pin" msgid="5422767284133234860">"เปิด/ปิดใช้งาน PIN ของซิม"</string>
     <string name="change_pin" msgid="9174186126330785343">"เปลี่ยน PIN ของซิม"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 ถูกบล็อกอย่างถาวร"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"คุณพยายามได้อีก <xliff:g id="NUMBER">%d</xliff:g> ครั้ง"</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"ไม่มีการบล็อก PIN2 อีกต่อไป"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"เครือข่ายหรือซิมการ์ดเกิดข้อผิดพลาด"</string>
     <string name="doneButton" msgid="2859593360997984240">"เสร็จสิ้น"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"หมายเลขข้อความเสียง"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"กำลังโทรออก"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"กำลังโทรออก"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"สายที่ไม่ได้รับ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"สายที่ไม่ได้รับ"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> สายที่ไม่ได้รับ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"สายที่ไม่ได้รับจาก <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"โทรต่อเนื่อง"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"พักสาย"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"สายเรียกเข้า"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ข้อความเสียงใหม่"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"ข้อความเสียงใหม่ (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"หมุนหมายเลข <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"วางสาย"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"โทรกลับ"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"ข้อความ"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"ปิดโหมดบนเครื่องบินเพื่อโทรออก"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"ปิดโหมดบนเครื่องบินหรือเชื่อมต่อเครือข่ายไร้สายเพื่อโทรออก"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ยังไม่ได้ลงทะเบียนบนเครือข่าย"</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <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">"ซิมการ์ดในตัว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b9b0f07..5dd83a9 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Mga account ng telepono"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Magdagdag ng SIP account"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"I-configure ang mga setting ng account"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Lahat ng account sa pagtawag"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Piliin kung aling mga account ang maaaring tumawag"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Pagtawag sa pamamagitan ng Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Huwag gumamit ng pagtawag sa pamamagitan ng Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Huwag gumamit ng assistant sa pagtawag"</string>
@@ -114,12 +116,12 @@
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Naka-off"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Hindi sinusuportahan ng iyong operator ang hindi pagpapagana sa pagpasa ng tawag kapag abala ang iyong telepono."</string>
     <string name="labelCFNRy" msgid="1736067178393744351">"Kapag hindi sinagot"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Numero kapag hindi nasagot"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Numero kapag hindi sinagot"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Pinapasa sa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Naka-off"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Hindi sinusuportahan ng iyong operator ang hindi pagpapagana sa pagpasa ng tawag kapag hindi sumasagot ang iyong telepono."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"Kapag hindi makontak"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"Numero kapag hindi maabot"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Numero kapag hindi makontak"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Pinapasa sa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Hindi pinagana"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Hindi sinusuportahan ng iyong carrier ang hindi pagpapagana ng pagpasa ng tawag kapag hindi maabot ang iyong telepono."</string>
@@ -339,12 +341,12 @@
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Listahan ng FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Pag-activate ng FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Pinagana ang Mga Fixed Dialing Number"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Hindi pinagana ang Mga Fixed Dialing Number"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Paganahin ang FDN"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Naka-disable ang Mga Fixed Dialing Number"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"I-enable ang FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Huwag paganahin ang FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Baguhin ang PIN2"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Huwag paganahin ang FDN"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Paganahin ang FDN"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"I-enable ang FDN"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Pamahalaan ang Mga Fixed Dialing Number"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Palitan ang PIN para sa access sa FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Pamahalaan ang listahan ng numero ng telepono"</string>
@@ -377,7 +379,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 upang i-import"</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Piliin ang mga contact na ii-import"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"I-off ang airplane mode upang mag-import ng mga contact mula sa SIM card."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Paganahin/huwag paganahin ang PIN ng SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Baguhin ang PIN ng SIM"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"Permanenteng na-block ang PUK2."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Mayroon ka na lang <xliff:g id="NUMBER">%d</xliff:g> (na) natitirang pagsubok."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"Hindi na naka-block ang PIN2"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Error sa network o SIM card"</string>
     <string name="doneButton" msgid="2859593360997984240">"Tapos na"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numero ng voicemail"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dina-dial"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Naka-hold"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Binababa"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Nasa tawag"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Dina-dial"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Hindi nasagot na tawag"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Mga hindi nasagot na tawag"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> (na) hindi nasagot na tawag"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Hindi nasagot na tawag mula kay <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Kasalukuyang tawag"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Naka-hold"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Papasok na tawag"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Bagong voicemail"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Bagong voicemail (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"I-dial ang <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Hindi kilala ang numero ng voicemail"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Walang serbisyo"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Hindi available ang mga piniling network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>)"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Ibaba"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Tawagan"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Padalhan ng mensahe"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"I-off ang airplane mode upang makatawag."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"I-off ang airplane mode o kumonekta sa isang wireless network upang makatawag."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Hindi nakarehistro sa network."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"Mag-dial"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Mag-vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mag-vibrate"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Tunog"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ringtone at Pag-vibrate"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Mga built-in na SIM card"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index cbec82f..7ca27a6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefon hesapları"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP hesabı ekle"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Hesap ayarlarını yapılandır"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Tüm çağrı hesapları"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Hangi hesapların telefon edebileceğini seçin"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Kablosuz çağrı"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Kablosuz çağrıyı kullanma"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Çağrı asistanını kullanma"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 kalıcı olarak engellendi."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"<xliff:g id="NUMBER">%d</xliff:g> deneme hakkınız kaldı."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 artık engellenmiş durumda değil"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Ağ veya SIM kart hatası"</string>
     <string name="doneButton" msgid="2859593360997984240">"Bitti"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Sesli mesaj numarası"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Çevriliyor"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Beklemede"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Sonlandırılıyor"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Çağrı halinde"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Çevriliyor"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Cevapsız çağrı"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cevapsız çağrılar"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> cevapsız çağrı"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Cevapsız çağrı: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Devam eden çağrılar"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Beklemede"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Gelen çağrı"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Yeni sesli mesaj"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Yeni sesli mesaj (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Çevir: <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Sesli mesaj numarası bilinmiyor"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Hizmet yok"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Seçili ağ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) kullanılamıyor"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Kapat"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Geri ara"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesaj gönder"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Telefon etmek için uçak modunu kapatın."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Telefon etmek için uçak modunu kapatın veya kablosuz ağa bağlanın."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ağda kayıtlı değil."</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"çevir"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Titreşim"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Titreşim"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ses"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Zil Sesi ve Titreşim"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Yerleşik SIM kartlar"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3ebd186..7fbc27f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"Виберіть, з яких облікових записів можна телефонувати"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Дзвінки через Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Не використовувати дзвінки через Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Не використовувати помічника викликів"</string>
@@ -99,28 +101,28 @@
     <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" 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>
-    <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="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>
@@ -141,7 +143,7 @@
   <string-array name="clir_display_values">
     <item msgid="5560134294467334594">"Налаштування мережі за умовчанням"</item>
     <item msgid="7876195870037833661">"Сховати номер"</item>
-    <item msgid="1108394741608734023">"Показ. номер"</item>
+    <item msgid="1108394741608734023">"Показувати номер"</item>
   </string-array>
     <string name="vm_changed" msgid="380744030726254139">"Номер голос. пошти змінено."</string>
     <string name="vm_change_failed" msgid="3352934863246208918">"Не вдалося змінити номер голосової пошти.\nЗв’яжіться зі своїм оператором, якщо проблема не зникне."</string>
@@ -336,7 +338,7 @@
     <string name="fdn" msgid="7878832555095183202">"Номери фіксованого набору"</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">"Список фіксованих номерів (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Фіксовані номери (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Активація FDN"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Номери фіксованого набору увімкнено"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Номери фіксованого набору вимкнено"</string>
@@ -375,8 +377,8 @@
     <string name="fdn_invalid_number" msgid="1494755047900009147">"Фіксований номер (FDN) не оновлено, оскільки кількість цифр не може перевищувати 20."</string>
     <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Фіксований номер (FDN) не оновлено. PIN2-код неправильний або номер телефону відхилено."</string>
     <string name="fdn_failed" msgid="540018079008319747">"Помилка набору фіксованого номера."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Читання з SIM-карти…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"У SIM-карті немає контактів."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Читання із SIM-карти…"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"На SIM-карті немає контактів"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Виберіть контакти для імпорту"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"Щоб імпортувати контакти із SIM-карти, вимкніть режим польоту."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Увімк./вимк. PIN-код SIM"</string>
@@ -412,9 +414,10 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2-код назавжди заблоковано."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"У вас залишилося стільки спроб: <xliff:g id="NUMBER">%d</xliff:g>."</string>
     <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="card_title_dialing" msgid="5769417478498348054">"Набір"</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>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Вхідний дзвінок"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"Набір"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Пропущ. виклик"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропущ. дзвінки"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Пропущ. дзвінк: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропущ. виклик від <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Поточний виклик"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Очікує"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Вхідний дзвінок"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова голос. пошта"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Нова голос. пошта (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Набрати <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"Завершити виклик"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Передзвонити"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Повідомлення"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Щоб зателефонувати, вимкніть режим польоту."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Щоб зателефонувати, вимкніть режим польоту або під’єднайтеся до бездротової мережі."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Не зареєстровано в мережі."</string>
@@ -465,7 +457,7 @@
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Закінч."</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Цифр. клав."</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Вимк. зв."</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"Дод. виклик"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"Додати виклик"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Об’єдн. дзвінки"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Поміняти"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Керув. викликами"</string>
@@ -551,6 +543,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Звук"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Сигнал дзвінка та вібросигнал"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Вбудовані SIM-карти"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 43e7b75..5b335ae 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"منتخب کریں کہ کون سے اکاؤنٹس کالز کر سکتے ہیں"</string>
     <string name="wifi_calling" msgid="739018212480165598">"‏Wi-Fi کالنگ"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"‏Wi-Fi کالنگ کا استعمال نہ کریں"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"کال اسسٹنٹ کا استعمال نہ کریں"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"‏PUK2 مستقل طور پر مسدود ہے۔"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"آپ کے پاس <xliff:g id="NUMBER">%d</xliff:g> کوششیں بچی ہیں۔"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"ڈائل ہو رہا ہے"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"ڈائل ہو رہا ہے"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"چھوٹی ہوئی کال"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"چھوٹی ہوئی کالیں"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> چھوٹی ہوئی کالیں"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> کی جانب سے چھوٹی ہوئی کال"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"جاری کال"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"ہولڈ پر"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"آنے والی کال"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"نیا صوتی میل"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"نیا صوتی میل (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> ڈائل کریں"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"کال منقطع کریں"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"واپس کال کریں"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"پیغام"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"کال کرنے کیلئے ہوائی جہاز وضع آف کریں۔"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"کال کرنے کیلئے ہوائی جہاز وضع آف کریں یا کسی وائرلیس نیٹ ورک سے منسلک ہوں۔"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"نیٹ ورک پر رجسٹرڈ نہیں ہے۔"</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"آواز"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"رنگ ٹون اور وائبریٹ"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"‏پہلے سے شامل SIM کارڈز"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 2c46b98..029e598 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -20,7 +20,7 @@
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
     <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Favqulodda tergich"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"FDN ro‘yxati"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"Ruxsat etilgan raqamlar"</string>
     <string name="unknown" msgid="6878797917991465859">"Noma’lum"</string>
     <string name="private_num" msgid="6713286113000232309">"Shaxsiy raqam"</string>
     <string name="payphone" msgid="4793877574636445118">"Taksofon"</string>
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Telefon hisoblari"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"SIP hisobini qo‘shish"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Hisob sozlamalarini shakllantirish"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Barcha qo‘ng‘iroq hisoblari"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Qo‘ng‘iroqlarni amalga oshirish mumkin bo‘lgan hisoblarni tanlang"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi qo‘ng‘iroq"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Wi-Fi qo‘ng‘iroqlardan foydalanilmasin"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Qo‘ng‘iroq yordamchisidan foydalanilmasin"</string>
@@ -80,7 +82,7 @@
     <string name="wifi_calling_call_assistant_configure" msgid="1092639708949670031">"Sozlash"</string>
     <string name="connection_service_default_label" msgid="1498481943805913754">"Ichki o‘rnatilgan ulanish xizmati"</string>
     <string name="voicemail" msgid="8693759337917898954">"Ovozli xabar"</string>
-    <string name="voicemail_settings_with_label" msgid="152724978380748296">"(<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>) audio xabari"</string>
+    <string name="voicemail_settings_with_label" msgid="152724978380748296">"Ovozli pochta (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
     <string name="networks" msgid="8873030692174541976">"Tarmoq operatorlari"</string>
     <string name="cell_broadcast_settings" msgid="8740238216690502563">"Favqulodda tarqatma xabarlar"</string>
@@ -91,36 +93,36 @@
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Qo‘shimcha CDMA qo‘ng‘iroq sozlamalari"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Qo‘shimcha qo‘ng‘iroq sozlamalari uchun faqat CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Tarmoq xizmati sozlamalari"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"Qo‘ng‘iroq qiluvchining nomi"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"Raqamni aniqlash xizmati"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Sozlamalar yuklanmoqda…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Chiquvchi qo‘ng‘iroqlarda raqam ko‘rsatilmasin"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Raqam chiquvchi qo‘ng‘iroqlarda ko‘rsatilsin"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Mening raqamimni chiquvchi qo‘ng‘iroqlarda ko‘rsatish uchun standart tarmoq operatori sozlamalaridan foydalanilsin"</string>
-    <string name="labelCW" msgid="6120513814915920200">"Kutish qo‘ng‘irog‘i"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Qo‘ng‘iroq davomida kiruvchi qo‘ng‘iroqlar bo‘lsa, meni ogohlantir"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Qo‘ng‘iroq davomida kiruvchi qo‘ng‘iroqlar bo‘lsa, meni ogohlantir"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Chiquvchi qo‘ng‘iroqlarda telefon raqamimni ko‘rsatish uchun operatorning standart sozlamalaridan foydalanilsin"</string>
+    <string name="labelCW" msgid="6120513814915920200">"Qo‘ng‘iroqni kutish"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Suhbat vaqtidagi kiruvchi qo‘ng‘iroqlar haqida xabar qilinsin"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Suhbat vaqtidagi kiruvchi qo‘ng‘iroqlar haqida xabar qilinsin"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Qo‘ng‘iroqni yo‘naltirish sozlamalari"</string>
     <string name="call_forwarding_settings_with_label" msgid="8569489414006897127">"Qo‘ng‘iroqni yo‘naltirish sozlamalari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="labelCF" msgid="2574386948026924737">"Qo‘ng‘iroqni yo‘naltirish"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Doimo yo‘naltirish"</string>
-    <string name="messageCFU" msgid="3560082430662923687">"Ushbu raqamdan doimo foydalanish"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"Har doim yo‘naltirish"</string>
+    <string name="messageCFU" msgid="3560082430662923687">"Qo‘ng‘iroq har doim ushbu raqamga yo‘naltirilsin"</string>
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Barcha qo‘ng‘iroqlar yo‘naltirilmoqda"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"Barcha qo‘ng‘iroqlar <xliff:g id="PHONENUMBER">{0}</xliff:g>ga yo‘naltirilmoqda"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Raqam mavjud emas"</string>
     <string name="sum_cfu_disabled" msgid="8384177689501334080">"O‘chirilgan"</string>
     <string name="labelCFB" msgid="6139853033106283172">"Band bo‘lsam"</string>
-    <string name="messageCFB" msgid="3711089705936187129">"Band bo‘lganda raqam"</string>
-    <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g>ga yo‘naltirilmoqda"</string>
+    <string name="messageCFB" msgid="3711089705936187129">"Ushbu raqamga yo‘naltirilsin"</string>
+    <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> raqamiga yo‘naltiriladi"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"O‘chirilgan"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Telefoningiz band bo‘lganda qo‘ng‘iroqlarni boshqa raqamga yo‘naltirishni o‘chirish xususiyati tarmoq operatoringizda yo‘q."</string>
     <string name="labelCFNRy" msgid="1736067178393744351">"Javob bermasam"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Javob berilmaganda raqam"</string>
-    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g>ga yo‘naltirilmoqda"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Ushbu raqamga yo‘naltirilsin"</string>
+    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> raqamiga yo‘naltiriladi"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"O‘chirilgan"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Telefoningiz javob bermayotganda qo‘ng‘iroqlarni boshqa raqamga yo‘naltirishni o‘chirish xususiyati operatoringizda yo‘q."</string>
     <string name="labelCFNRc" msgid="2614827454402079766">"Menga tushib bo‘lmasa"</string>
-    <string name="messageCFNRc" msgid="6380695421020295119">"O‘chirilganda raqam"</string>
-    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g>ga yo‘naltirilmoqda"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"Ushbu raqamga yo‘naltirilsin"</string>
+    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> raqamiga yo‘naltiriladi"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"O‘chirilgan"</string>
     <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Telefoningiz o‘chiq bo‘lganida qo‘ng‘iroqlarni boshqa raqamga yo‘naltirishni o‘chirish xususiyati tarmoq operatoringizda yo‘q."</string>
     <string name="updating_title" msgid="6146755386174019046">"Qo‘ng‘iroq sozlamalari"</string>
@@ -139,9 +141,9 @@
     <string name="disable" msgid="4678348128118573672">"O‘chirib qo‘yish"</string>
     <string name="change_num" msgid="239476305819844391">"Yangilash"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Standart tarmoq"</item>
-    <item msgid="7876195870037833661">"Raqamni yashirish"</item>
-    <item msgid="1108394741608734023">"Raqamni ko‘rsatish"</item>
+    <item msgid="5560134294467334594">"Standart tarmoq sozlamalari"</item>
+    <item msgid="7876195870037833661">"Raqam ko‘rsatilmasin"</item>
+    <item msgid="1108394741608734023">"Raqam ko‘rsatilsin"</item>
   </string-array>
     <string name="vm_changed" msgid="380744030726254139">"Ovozli pochta raqami o‘zgardi."</string>
     <string name="vm_change_failed" msgid="3352934863246208918">"Ovozli pochta raqami o‘zgarmadi.\nUshbu muammoni hal qila olmasangiz, operatoringiz bilan bog‘laning."</string>
@@ -152,7 +154,7 @@
     <string name="voicemail_default" msgid="2001233554889016880">"Aloqa operatoringiz"</string>
     <string name="mobile_networks" msgid="2843854043339307375">"Mobil tarmoq sozlamalari"</string>
     <string name="label_available" msgid="1181658289009300430">"Mavjud tarmoqlar"</string>
-    <string name="load_networks_progress" msgid="5230707536168902952">"Qidirmoqda…"</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="network_query_error" msgid="6828516148953325006">"Tarmoqlar izlanayotganda xato."</string>
@@ -165,9 +167,9 @@
     <string name="select_automatically" msgid="5628402124471810174">"Avtomatik tanlash"</string>
     <string name="sum_select_automatically" msgid="5614890115123292400">"Siz xohlagan tarmoqni avtomatik tanlash"</string>
     <string name="register_automatically" msgid="6017849844573519637">"Avtomatik ro‘yxatdan o‘tish…"</string>
-    <string name="preferred_network_mode_title" msgid="2336624679902659306">"Tanlangan tarmoq turi"</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>
-    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tanlangan tarmoq turi"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="4048082093347807230">"Tarmoq turi"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Tanlangan tarmoq rejimi: WCDMA tanlangan"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Tanlangan tarmoq rejimi: faqat GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Tanlangan tarmoq rejimi: faqat WCDMA"</string>
@@ -333,20 +335,20 @@
     <string name="cdma_activate_device" msgid="3793805892364814518">"Qurilmani faollashtirish"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ma’lumot xizmatini o‘rnatish"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Tarmoq operatori sozlamalari"</string>
-    <string name="fdn" msgid="7878832555095183202">"Ruxsat berilgan raqamlar"</string>
+    <string name="fdn" msgid="7878832555095183202">"O‘zgarmas chaqiruv raqamlari"</string>
     <string name="fdn_with_label" msgid="187084204115493366">"O‘zgarmas chaqiruv raqamlari (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"FDN ro‘yxati"</string>
-    <string name="fdn_list_with_label" msgid="7437232552210469217">"O‘zgarmas chaqiruv raqamlari ro‘yxati (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
-    <string name="fdn_activation" msgid="2156479741307463576">"FDN’ni faollashtirish"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"O‘zgarmas raqamlar"</string>
+    <string name="fdn_list_with_label" msgid="7437232552210469217">"Ruxsat etilgan raqamlar ro‘yxati (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"FDNni faollashtirish"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Ruxsat berilgan raqamlar yoqib qo‘yildi"</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Ruxsat berilgan raqamlar o‘chirib qo‘yildi"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"FDN’ni yoqish"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"FDN’ni o‘chirish"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"O‘zgarmas chaqiruv raqamlari o‘chirib qo‘yilgan"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"FDNni yoqish"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"FDNni o‘chirib qo‘yish"</string>
     <string name="change_pin2" msgid="2153563695382176676">"PIN2 kodni o‘zgartiring"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN’ni o‘chirish"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN’ni yoqish"</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">"FDN’ga kirish uchun PIN kodni almashtiring"</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>
@@ -379,8 +381,8 @@
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartangizda kontaktlar yo‘q."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Import u-n kontaktlarni tanlang"</string>
     <string name="simContacts_airplaneMode" msgid="5254946758982621072">"SIM kartadan kontaktlarni import qilish uchun parvoz rejimini o‘chiring"</string>
-    <string name="enable_pin" msgid="5422767284133234860">"SIM karta PIN kodini yoqish/o‘chirish"</string>
-    <string name="change_pin" msgid="9174186126330785343">"SIM karta PIN kodini o‘zgartirish"</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>
@@ -388,7 +390,7 @@
     <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="disable_sim_pin" msgid="3419351358300716472">"SIM karta PIN kodini o‘chirish"</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>
@@ -396,7 +398,7 @@
     <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 kodi"</string>
+    <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Eski PIN2 kod"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Yangi PIN2 kodi"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Yangi PIN2 kodni tasdiqlash"</string>
@@ -412,6 +414,7 @@
     <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>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Tarmoq yoki SIM kartada xato"</string>
     <string name="doneButton" msgid="2859593360997984240">"Tayyor"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Ovozli pochta raqami"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Raqam terilmoqda"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Kutish holatida"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Go‘shak qo‘yilmoqda"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Qo‘ng‘iroqda"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Terilmoqda"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Javobsiz qo‘ng‘iroq"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Javobsiz qo‘ng‘iroqlar"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ta javobsiz qo‘ng‘iroq"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> qo‘ng‘irog‘i javobsiz qoldirildi"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Joriy qo‘ng‘iroq"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Kutmoqda"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Kiruvchi qo‘ng‘iroq"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Yangi ovozli xabar"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Yangi ovozli xabar (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>ni terish"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Ovozli pochta raqami noma’lum"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Xizmat mavjud emas"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Tanlangan tarmoq (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) mavjud emas"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Go‘shakni qo‘yish"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Qo‘ng‘iroq"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"SMS"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Qo‘ng‘iroq qilish uchun parvoz rejimini o‘chiring"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Qo‘ng‘iroq qilish uchun parvoz rejimini o‘chiring yoki simsiz tarmoqqa ulaning."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tarmoqda ro‘yxatdan o‘tmagan."</string>
@@ -487,7 +479,7 @@
     <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF tovushlari"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMF tovushlari uzunligini o‘rnatish"</string>
   <string-array name="dtmf_tone_entries">
-    <item msgid="899650777817315681">"O‘rtacha"</item>
+    <item msgid="899650777817315681">"Odatiy"</item>
     <item msgid="2883365539347850535">"Uzun"</item>
   </string-array>
     <string name="network_info_message" msgid="7738596060242881930">"Tarmoq xabari"</string>
@@ -511,7 +503,7 @@
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC XATOLARI KO‘PAYIB KETDI"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Orqaga"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Yana urinib ko‘ring"</string>
-    <string name="ota_next" msgid="3904945374358235910">"Navbatdagi"</string>
+    <string name="ota_next" msgid="3904945374358235910">"Keyingi"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Favqulodda teskari qo‘ng‘iroq rejimi kiritildi"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Favqulodda teskari qo‘ng‘iroq rejimi"</string>
@@ -534,7 +526,7 @@
     <string name="alert_dialog_no" msgid="1476091437797628703">"Yo‘q"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Rad qilish"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Xizmat"</string>
-    <string name="voicemail_settings" msgid="72448049107749316">"Moslash"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Sozlash"</string>
     <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ko‘rsatilmagan&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Boshqa qo‘ng‘iroq sozlamalari"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> orqali qo‘ng‘rioq qilinmoqda"</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"terish"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Tebranish"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Tebratish"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Ovoz"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Qo‘ng‘iroq ohangi &amp; tebranish"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Ichki o‘rnatilgan SIM kartalar"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 757517f..90eddcb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Tài khoản điện thoại"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Thêm tài khoản SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Định cấu hình cài đặt tài khoản"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Tất cả các tài khoản gọi"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Chọn tài khoản có thể thực hiện cuộc gọi"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Gọi qua Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Không sử dụng tính năng gọi qua Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Không sử dụng trợ lý cuộc gọi"</string>
@@ -91,7 +93,7 @@
     <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Cài đặt cuộc gọi CDMA bổ sung"</string>
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Cài đặt cuộc gọi chỉ CDMA bổ sung"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Cài đặt dịch vụ mạng"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"Số gọi đến"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"ID người gọi"</string>
     <string name="sum_loading_settings" msgid="1826692909391168620">"Đang tải cài đặt…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Số bị ẩn trong cuộc gọi đi"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Số được hiển thị trong cuộc gọi đi"</string>
@@ -113,8 +115,8 @@
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Chuyển tiếp tới <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="4913145177320506827">"Tắt"</string>
     <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn bận."</string>
-    <string name="labelCFNRy" msgid="1736067178393744351">"Khi không được trả lời"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Số khi không được trả lời"</string>
+    <string name="labelCFNRy" msgid="1736067178393744351">"Khi không trả lời"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"Số khi không trả lời"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Chuyển tiếp tới <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="3884684060443538097">"Tắt"</string>
     <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn không trả lời."</string>
@@ -139,7 +141,7 @@
     <string name="disable" msgid="4678348128118573672">"Tắt"</string>
     <string name="change_num" msgid="239476305819844391">"Cập nhật"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Mặc định mạng"</item>
+    <item msgid="5560134294467334594">"Mặc định theo mạng"</item>
     <item msgid="7876195870037833661">"Ẩn số"</item>
     <item msgid="1108394741608734023">"Hiển thị số"</item>
   </string-array>
@@ -334,7 +336,7 @@
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Thiết lập dịch vụ dữ liệu"</string>
     <string name="carrier_settings_title" msgid="9028166176523012300">"Cài đặt nhà cung cấp dịch vụ"</string>
     <string name="fdn" msgid="7878832555095183202">"Số Quay Định sẵn"</string>
-    <string name="fdn_with_label" msgid="187084204115493366">"Số gọi cố định (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
+    <string name="fdn_with_label" msgid="187084204115493366">"Số gọi định sẵn (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Danh sách FDN"</string>
     <string name="fdn_list_with_label" msgid="7437232552210469217">"Danh sách FDN (<xliff:g id="SUBSCRIPTIONLABEL">%s</xliff:g>)"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Kích hoạt FDN"</string>
@@ -412,9 +414,10 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 bị chặn vĩnh viễn."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Bạn còn <xliff:g id="NUMBER">%d</xliff:g> lần thử."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"PIN2 không còn bị chặn"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Lỗi mạng hoặc thẻ SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Xong"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Số thư thoại"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Đang quay số"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">"Đang gọi"</string>
     <string name="card_title_redialing" msgid="8253487008234167266">"Đang quay số lại"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Cuộc gọi hội nghị"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Cuộc gọi đến"</string>
@@ -422,23 +425,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Đang chờ"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Kết thúc cuộc gọi"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Đang trong cuộc gọi"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Đang gọi"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Cuộc gọi nhỡ"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cuộc gọi nhỡ"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> cuộc gọi nhỡ"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Cuộc gọi nhỡ từ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Cuộc gọi đang thực hiện"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Đang chờ"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Cuộc gọi đến"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Thư thoại mới"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Thư thoại mới (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Quay số <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Số thư thoại không xác định"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Không có dịch vụ nào"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Mạng được chọn (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) không khả dụng"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Kết thúc"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Gọi lại"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Tin nhắn"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Tắt chế độ trên máy bay để thực hiện cuộc gọi."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Tắt chế độ trên máy bay hoặc kết nối với mạng không dây để thực hiện cuộc gọi."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Chưa được đăng ký trên mạng."</string>
@@ -535,7 +527,7 @@
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Loại bỏ"</string>
     <string name="voicemail_provider" msgid="5135942703327136909">"Dịch vụ"</string>
     <string name="voicemail_settings" msgid="72448049107749316">"Thiết lập"</string>
-    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Chưa được đặt&gt;"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Chưa đặt&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Cài đặt cuộc gọi khác"</string>
     <string name="calling_via_template" msgid="4839419581866928142">"Gọi điện qua <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"ảnh liên hệ"</string>
@@ -545,6 +537,8 @@
     <string name="description_dial_button" msgid="7459705245418435351">"quay số"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Rung"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Rung"</string>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Âm thanh"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Nhạc chuông và rung"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Thẻ SIM tích hợp sẵn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c7338c9..cc2dd5f 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"选择可用于拨打电话的帐户"</string>
     <string name="wifi_calling" msgid="739018212480165598">"WLAN 通话"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"不使用 WLAN 通话功能"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"不使用通话助手"</string>
@@ -412,6 +414,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2码已被永远锁定。"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"您还可以尝试输入 <xliff:g id="NUMBER">%d</xliff:g> 次。"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"正在拨号"</string>
@@ -422,23 +425,12 @@
     <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_dialing" msgid="2107666444937350731">"正在拨号"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接电话"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接电话"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> 个未接电话"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"来自<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>的未接电话"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"当前通话"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"保持"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"来电"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新语音邮件"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"新语音邮件 (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"拨打 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"挂断"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"回拨"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"短信"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"需关闭飞行模式才能拨打电话。"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"需关闭飞行模式或连接至无线网络才能拨打电话。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"尚未注册网络。"</string>
@@ -545,6 +537,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"提示音"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"铃声和振动"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"内置SIM卡"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index c869eb3..1147e99 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"選擇可以撥號的帳戶"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi 通話"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"不要使用 Wi-Fi 通話功能"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"不要使用通話小幫手"</string>
@@ -418,6 +420,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 碼已被永久封鎖。"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"您還有 <xliff:g id="NUMBER">%d</xliff:g> 次嘗試機會。"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"撥號中"</string>
@@ -428,23 +431,12 @@
     <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_dialing" msgid="2107666444937350731">"撥號中"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接來電"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接來電"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> 未接電話"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>打來的未接來電"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"保留通話"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"來電"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新留言"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"新留言 (<xliff:g id="COUNT">%d</xliff:g> 個)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"撥號 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"掛斷"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"回撥"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"短訊"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"關閉飛行模式以撥打電話。"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"關閉飛行模式或連接無線網絡,以撥打電話。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"未在網絡上完成註冊。"</string>
@@ -551,6 +543,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"音效"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"內置 SIM 卡"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index fb70643..563bf1a 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -68,6 +68,8 @@
     <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_summary" msgid="8594186415822657011">"選取可撥打電話的帳戶"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Wi-Fi 通話"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"不使用 Wi-Fi 通話功能"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"不使用通話小幫手"</string>
@@ -96,7 +98,7 @@
     <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="labelCW" msgid="6120513814915920200">"來電待接"</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="call_forwarding_settings" msgid="3378927671091537173">"來電轉接設定"</string>
@@ -109,7 +111,7 @@
     <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="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>
@@ -418,6 +420,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"PUK2 遭到永久封鎖。"</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"您還可以嘗試 <xliff:g id="NUMBER">%d</xliff:g> 次。"</string>
     <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="card_title_dialing" msgid="5769417478498348054">"撥號中"</string>
@@ -428,23 +431,12 @@
     <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_dialing" msgid="2107666444937350731">"撥號中"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"未接來電"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接來電"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> 通未接來電"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"來自 <xliff:g id="MISSED_CALL_FROM">%s</xliff:g> 的未接來電"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"通話保留"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"來電"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新留言"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"新留言 (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"撥打 <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_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="notification_action_end_call" msgid="6069460915123531620">"掛斷"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"回撥"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"簡訊"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"關閉飛航模式即可撥打電話。"</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"關閉飛航模式或連上無線網路即可撥打電話。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"尚未註冊網路。"</string>
@@ -551,6 +543,8 @@
     <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>
+    <!-- no translation found for voicemail_visual_voicemail_switch_title (5012622186976275457) -->
+    <skip />
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"音效"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"鈴聲與震動"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"內建 SIM 卡"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 11f394b..43ab52d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -68,6 +68,8 @@
     <string name="phone_accounts_selection_header" msgid="1365215726106915865">"Ama-akhawunti wefoni"</string>
     <string name="phone_accounts_add_sip_account" msgid="2023821743341923271">"Engeza i-akhawunti ye-SIP"</string>
     <string name="phone_accounts_configure_account_settings" msgid="1361715069911607109">"Lungiselela izilungiselelo ze-akhawunti"</string>
+    <string name="phone_accounts_all_calling_accounts" msgid="207619531589278471">"Wonke ama-akhawunti wokushaya"</string>
+    <string name="phone_accounts_all_calling_accounts_summary" msgid="8594186415822657011">"Khetha ukuthi imaphi ama-akhawunti angenza amakholi"</string>
     <string name="wifi_calling" msgid="739018212480165598">"Ukushaya kwe-Wi-Fi"</string>
     <string name="wifi_calling_do_not_use" msgid="7491443219113013323">"Ungasebenzisi ukushaya nge-Wi-Fi"</string>
     <string name="wifi_calling_do_not_use_call_assistant" msgid="5420257095556091770">"Ungasebenzisi umsizi wokushaya"</string>
@@ -416,6 +418,7 @@
     <string name="puk2_blocked" msgid="3150263853077280049">"I-PUK2 ivinjiwe unaphakade."</string>
     <string name="pin2_attempts" msgid="720736232885011507">\n"Unemizamo engu-<xliff:g id="NUMBER">%d</xliff:g> esele."</string>
     <string name="pin2_unblocked" msgid="7791600368153469078">"I-PIN2 ayisavinjiwe"</string>
+    <string name="pin2_error_exception" msgid="1088689322248996699">"Iphutha lenethiwekhi noma lekhadi le-SIM"</string>
     <string name="doneButton" msgid="2859593360997984240">"Kwenziwe"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Inombolo yevoyisimeyili"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Iyadayela"</string>
@@ -426,23 +429,12 @@
     <string name="card_title_on_hold" msgid="821463117892339942">"Ibambile"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Iyavala"</string>
     <string name="card_title_in_call" msgid="6346543933068225205">"Isecingweni"</string>
-    <string name="notification_dialing" msgid="2107666444937350731">"Iyadayela"</string>
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Ikholi ekulahlekele"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Amakholi akuphuthele"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> amakholi akulahlekele"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Uphuthelwe ikholi ephuma ku-<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call" msgid="7068688957273482989">"Ikholi eqhubekayo"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Ibambile"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Ikholi engenayo"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Umlayezo wezwi omusha"</string>
     <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Umyalezo wezwi omusha (<xliff:g id="COUNT">%d</xliff:g>)"</string>
     <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Dayela <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Inombolo yevoyisimeyili ayaziwa"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ayikho isevisi"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Inethiwekhi ekhethiwe <xliff:g id="OPERATOR_NAME">%s</xliff:g> ayitholakali"</string>
-    <string name="notification_action_end_call" msgid="6069460915123531620">"Vala ikholi"</string>
-    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Phinda ushaye"</string>
-    <string name="notification_missedCall_message" msgid="3049928912736917988">"Umlayezo"</string>
     <string name="incall_error_power_off" msgid="2947938060513306698">"Vala imodi yendiza ukuze wenze ikholi."</string>
     <string name="incall_error_power_off_wfc" msgid="8711428920632416575">"Vala imodi yendiza noma xhumeka kunethiwekhi engenantambo ukuze wenze ikholi."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ayibhalisiwe kwinethiwekhi."</string>
@@ -549,6 +541,7 @@
     <string name="description_dial_button" msgid="7459705245418435351">"dayela"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Dlidliza"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Dlidliza"</string>
+    <string name="voicemail_visual_voicemail_switch_title" msgid="5012622186976275457">"Ivoyisimeyili ebonakalayo"</string>
     <string name="voicemail_notification_ringtone_title" msgid="2609519527849101590">"Umsindo"</string>
     <string name="preference_category_ringtone" msgid="5197960752529332721">"Ithoni yokukhala nokudlidliza"</string>
     <string name="pstn_connection_service_label" msgid="1743245930577325900">"Amakhadi we-SIM akhelwe ngaphakathi"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e6e3cd9..e8dac11 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -156,7 +156,7 @@
     <string name="phone_accounts_all_calling_accounts">All calling accounts</string>
     <!-- Summary for all-calling-account setting indicating that is where the user goes to enable
          and disable phone accounts. -->
-    <string name="phone_accounts_all_calling_accounts_summary">Enable active calling accounts</string>
+    <string name="phone_accounts_all_calling_accounts_summary">Select which accounts can make calls</string>
 
     <!-- Title for setting to select Wi-Fi call manager account -->
     <string name="wifi_calling">Wi-Fi calling</string>
@@ -897,6 +897,9 @@
     <string name="pin2_attempts">\nYou have <xliff:g id="number">%d</xliff:g> remaining attempts.</string>
     <!-- SIM PIN screen: status message displayed in a popup (toast) -->
     <string name="pin2_unblocked">PIN2 no longer blocked</string>
+    <!-- SIM PIN screen: error message shown in dialog when there is a network or sim error.
+         [CHAR LIMIT=NONE] -->
+    <string name="pin2_error_exception">Network or SIM card error</string>
 
     <!-- SIM PIN screen: button label -->
     <string name="doneButton">Done</string>
@@ -930,25 +933,6 @@
     <string name="card_title_in_call">In call</string>
 
     <!-- Notification strings -->
-    <!-- The "label" of the in-call Notification for a dialing call, used
-         as the format string for a Chronometer widget. [CHAR LIMIT=60] -->
-    <string name="notification_dialing">Dialing</string>
-    <!-- Missed call notification label, used when there's exactly one missed call -->
-    <string name="notification_missedCallTitle">Missed call</string>
-    <!-- Missed call notification label, used when there are two or more missed calls -->
-    <string name="notification_missedCallsTitle">Missed calls</string>
-    <!-- Missed call notification message used when there are multiple missed calls -->
-    <string name="notification_missedCallsMsg"><xliff:g id="num_missed_calls">%s</xliff:g> missed calls</string>
-    <!-- Missed call notification message used for a single missed call, including
-         the caller-id info from the missed call -->
-    <string name="notification_missedCallTicker">Missed call from <xliff:g id="missed_call_from">%s</xliff:g></string>
-    <!-- The "label" of the in-call Notification for an ongoing call, used
-         as the format string for a Chronometer widget. [CHAR LIMIT=60] -->
-    <string name="notification_ongoing_call">Ongoing call</string>
-    <!-- The "label" of the in-call Notification for a call that's on hold -->
-    <string name="notification_on_hold">On hold</string>
-    <!-- The "label" of the in-call Notification for an incoming ringing call -->
-    <string name="notification_incoming_call">Incoming call</string>
     <!-- Label for the "Voicemail" notification item, when expanded. -->
     <string name="notification_voicemail_title">New voicemail</string>
     <!-- Label for the expanded "Voicemail" notification item,
@@ -965,19 +949,6 @@
     <!-- Label for the expanded "No service" notification item, including the
          operator name set by user -->
     <string name="notification_network_selection_text">Selected network (<xliff:g id="operator_name">%s</xliff:g>) unavailable</string>
-    <!-- Message for "end call" Action.
-         It is displayed in the "Ongoing call" notification, which is shown
-         when the user is outside the in-call screen while the phone call is still
-         active. [CHAR LIMIT=40] -->
-    <string name="notification_action_end_call">Hang up</string>
-    <!-- Message for "call back" Action, which is displayed in the missed call notificaiton.
-         The user will be able to call back to the person or the phone number.
-         [CHAR LIMIT=60] -->
-    <string name="notification_missedCall_call_back">Call back</string>
-    <!-- Message for "reply via sms" action, which is displayed in the missed call notification.
-         The user will be able to send text messages using the phone number.
-         [CHAR LIMIT=60] -->
-    <string name="notification_missedCall_message">Message</string>
 
     <!-- In-call screen: call failure message displayed in an error dialog. [CHAR_LIMIT=NONE] -->
     <string name="incall_error_power_off">Turn off airplane mode to make a call.</string>
@@ -1241,11 +1212,14 @@
     -->
     <string name="description_dial_button">dial</string>
 
-    <!-- Dialog title for the vibration settings for voicemail notifications [CHAR LIMIT=40] -->
+    <!-- Title for the vibration settings for voicemail notifications [CHAR LIMIT=40] -->
     <string name="voicemail_notification_vibrate_when_title" msgid="8731372580674292759">Vibrate</string>
     <!-- Dialog title for the vibration settings for voice mail notifications [CHAR LIMIT=40]-->
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="8995274609647451109">Vibrate</string>
 
+    <!-- Visual voicemail on/off title [CHAR LIMIT=40] -->
+    <string name="voicemail_visual_voicemail_switch_title">Visual Voicemail</string>
+
     <!-- Voicemail ringtone title. The user clicks on this preference to select
          which sound to play when a voicemail notification is received.
          [CHAR LIMIT=30] -->
@@ -1311,6 +1285,8 @@
     <string name="voicemail_notification_ringtone_key">voicemail_notification_ringtone_key</string>
     <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
     <string name="voicemail_notification_vibrate_key">voicemail_notification_vibrate_key</string>
+    <!-- DO NOT TRANSLATE. Internal key for a visual voicemail preference. -->
+    <string name="voicemail_visual_voicemail_key">voicemail_visual_voicemail_key</string>
     <!-- DO NOT TRANSLATE. Internal key for tty mode preference. -->
     <string name="tty_mode_key">button_tty_mode_key</string>
     <!-- DO NOT TRANSLATE. Internal key for a voicemail notification preference. -->
diff --git a/res/xml/authenticator.xml b/res/xml/authenticator.xml
deleted file mode 100644
index f035d3a..0000000
--- a/res/xml/authenticator.xml
+++ /dev/null
@@ -1,18 +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.
--->
-<account-authenticator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:accountType="com.android.phone.vvm.omtp" />
\ No newline at end of file
diff --git a/res/xml/syncadapter.xml b/res/xml/syncadapter.xml
deleted file mode 100644
index b0484b1..0000000
--- a/res/xml/syncadapter.xml
+++ /dev/null
@@ -1,23 +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.
--->
-<sync-adapter
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:contentAuthority="com.android.voicemail"
-        android:accountType="com.android.phone.vvm.omtp"
-        android:userVisible="false"
-        android:supportsUploading="true"
-        android:allowParallelSyncs="false"
-        android:isAlwaysSyncable="true"/>
\ No newline at end of file
diff --git a/res/xml/voicemail_settings.xml b/res/xml/voicemail_settings.xml
index a7d5fb4..9334566 100644
--- a/res/xml/voicemail_settings.xml
+++ b/res/xml/voicemail_settings.xml
@@ -60,5 +60,8 @@
         android:key="@string/voicemail_notification_vibrate_key"
         android:title="@string/voicemail_notification_vibrate_when_title"
         android:persistent="true" />
+    <SwitchPreference
+        android:key="@string/voicemail_visual_voicemail_key"
+        android:title="@string/voicemail_visual_voicemail_switch_title" />"
 
 </PreferenceScreen>
diff --git a/sip/res/values-az-rAZ/strings.xml b/sip/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..7f5f340
--- /dev/null
+++ b/sip/res/values-az-rAZ/strings.xml
@@ -0,0 +1,77 @@
+<?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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sip_settings" msgid="3768482698061677257">"SIP parametrləri"</string>
+    <string name="sip_accounts" msgid="85559497282185405">"SIP hesabları"</string>
+    <string name="sip_accounts_title" msgid="2082527045326874519">"Hesablar"</string>
+    <string name="sip_receive_calls" msgid="426678617137462173">"Daxil olan zəngləri qəbul et"</string>
+    <string name="sip_receive_calls_summary" msgid="946161517528227523">"Daha çox batareya istismar müddətindən istifadə edir"</string>
+    <string name="sip_call_options_title" msgid="8421210494703869806">"SIP zəngindən istifadə et"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP zəngindən istifadə et (yalnız Wi-Fi)"</string>
+    <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Data şəbəkəsi əlçatımlı olanda bütün şəbəkələr üçün"</string>
+    <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Yalnız SIP zəngləri üçün"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Bütün zənglər üçün"</string>
+    <string name="add_sip_account" msgid="800843669753980091">"Hesab əlavə et"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Hesabı silin"</string>
+    <string name="sip_account_list" msgid="5610858485304821480">"SIP hesabları"</string>
+    <string name="saving_account" msgid="5336529880235177448">"Hesab yadda saxlanılır..."</string>
+    <string name="removing_account" msgid="5537351356808985756">"Hesab silinir..."</string>
+    <string name="sip_menu_save" msgid="7882219814563869225">"Yadda saxlayın"</string>
+    <string name="sip_menu_discard" msgid="2350421645423888438">"İmtina edin"</string>
+    <string name="alert_dialog_close" msgid="1326011828713435134">"Profili bağlayın"</string>
+    <string name="alert_dialog_ok" msgid="4752048404605388940">"Ok"</string>
+    <string name="close_profile" msgid="3122414058856309881">"Bağla"</string>
+    <string name="registration_status_checking_status" msgid="6136793741862200337">"Status yoxlanılır ..."</string>
+    <string name="registration_status_registering" msgid="2677183977796278749">"Qeydiyyatdan keçirilir..."</string>
+    <string name="registration_status_still_trying" msgid="7648151061205513458">"Hələ də cəhd edilir..."</string>
+    <string name="registration_status_not_receiving" msgid="7620333886153361090">"Zəngləri qəbul etmir."</string>
+    <string name="registration_status_no_data" msgid="2541999976218192413">"İnternet bağlantısı olmadığı üçün hesab qeydiyyatı dayandırıldı."</string>
+    <string name="registration_status_no_wifi_data" msgid="9154717387473039546">"Wi-Fi bağlantısı olmadığı üçün hesab qeydiyyatı dayandırıldı."</string>
+    <string name="registration_status_not_running" msgid="514205414303796800">"Hesab qeydiyyatı uğursuz oldu."</string>
+    <string name="registration_status_done" msgid="3264961069247314253">"Zəng qəbul olunur."</string>
+    <string name="registration_status_failed_try_later" msgid="2199970021756384317">"Hesab qeydiyyatı uğursuz oldu: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); sonra cəhd olunacaq"</string>
+    <string name="registration_status_invalid_credentials" msgid="8406872554323334182">"Hesab qeydiyyatı alınmadı: yanlış istifadə adı və ya parol"</string>
+    <string name="registration_status_server_unreachable" msgid="7710275557045148634">"Hesab qeydiyyatı uğursuz oldu: Server adını yoxlayın."</string>
+    <string name="third_party_account_summary" msgid="9041060473615403041">"Bu hesab hazırda <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> tətbiqi tərəfindən istifadə olunur."</string>
+    <string name="sip_edit_title" msgid="1967247832635750410">"SIP hesab detalları"</string>
+    <string name="sip_edit_new_title" msgid="266414118302574305">"SIP hesab detalları"</string>
+    <string name="domain_address_title" msgid="1968479941328225423">"Server"</string>
+    <string name="username_title" msgid="6770064611005663470">"İstifadəçi adı"</string>
+    <string name="password_title" msgid="5289013731515564295">"Şifrə"</string>
+    <string name="display_name_title" msgid="579241787583079773">"Ad göstərin"</string>
+    <string name="proxy_address_title" msgid="6890163365640631841">"Gedən proksi ünvan"</string>
+    <string name="port_title" msgid="6693965912656593862">"Port nömrəsi"</string>
+    <string name="transport_title" msgid="889155457465372527">"Nəqliyyat növü"</string>
+    <string name="send_keepalive_title" msgid="599627072150501159">"Daima canlı göndərin"</string>
+    <string name="advanced_settings" msgid="6622996380747040711">"Əlavə seçimlər"</string>
+    <string name="auth_username_title" msgid="8262491689004708265">"Autentifikasiya istifadəçi adı"</string>
+    <string name="auth_username_summary" msgid="941160241371436473">"Autentifikasiya üçün istifadə edilən istifadəçi adı"</string>
+    <string name="default_preference_summary" msgid="1979249643719483249">"&lt;Təyin edilməyib&gt;"</string>
+    <string name="display_name_summary" msgid="7155076491675565407">"&lt;İstifadəçi adı ilə eyni&gt;"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"&lt;İstəyə görə&gt;"</string>
+    <string name="advanced_settings_show" msgid="7838761602853998622">"Hamısını göstərmək üçün toxunun ▷"</string>
+    <string name="advanced_settings_hide" msgid="3480554978705290228">"Hamısını gizlətmək üçün toxunun ▽"</string>
+    <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> tələb olunur və boş buraxıla bilməz."</string>
+    <string name="not_a_valid_port" msgid="7931422555587011830">"Port 1000 və 65534 arasında olmalıdır."</string>
+    <string name="no_internet_available" msgid="5523747991760017298">"SIP zəngini yerləşdirmək üçün əvvəlcə İnternet bağlantınızı yoxlayın."</string>
+    <string name="no_wifi_available" msgid="1955023904229673488">"SIP zəngləri üçün siz Wi-Fi şəbəkəsinə qoşulu olmalısınız (Simsiz &amp; Şəbəkə parametrlərindən istifadə edin)."</string>
+    <string name="no_voip" msgid="3038021971231952704">"SIP zəngi dəstəklənmir"</string>
+    <string name="sip_system_decide" msgid="5577696249416700671">"Avtomatik"</string>
+    <string name="sip_always_send_keepalive" msgid="4773022409239823318">"Həmişə göndərin"</string>
+    <string name="sip_connection_service_label" msgid="6935325004265884453">"Daxili SIP zəngi"</string>
+</resources>
diff --git a/sip/res/values-de/strings.xml b/sip/res/values-de/strings.xml
index cc2b857..4bd04b8 100644
--- a/sip/res/values-de/strings.xml
+++ b/sip/res/values-de/strings.xml
@@ -22,7 +22,7 @@
     <string name="sip_receive_calls" msgid="426678617137462173">"Eingehende Anrufe annehmen"</string>
     <string name="sip_receive_calls_summary" msgid="946161517528227523">"Beansprucht den Akku stärker"</string>
     <string name="sip_call_options_title" msgid="8421210494703869806">"SIP-Telefonie nutzen"</string>
-    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"SIP-Telefonie nutzen (nur WLAN)"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="5112579243580893890">"Anrufe über SIP (nur WLAN)"</string>
     <string name="sip_call_options_entry_1" msgid="7217659161237099900">"Für alle Anrufe mit verfügbarem Datennetzwerk"</string>
     <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Nur für SIP-Anrufe"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"Für alle Anrufe"</string>
diff --git a/sip/res/values-es/strings.xml b/sip/res/values-es/strings.xml
index 73deae6..e100616 100644
--- a/sip/res/values-es/strings.xml
+++ b/sip/res/values-es/strings.xml
@@ -27,7 +27,7 @@
     <string name="sip_call_options_entry_2" msgid="1815335903940609729">"Solo para llamadas SIP"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="1358513095551847314">"En todas las llamadas"</string>
     <string name="add_sip_account" msgid="800843669753980091">"Añadir cuenta"</string>
-    <string name="remove_sip_account" msgid="1367664438506503690">"Eliminar cuenta"</string>
+    <string name="remove_sip_account" msgid="1367664438506503690">"Quitar cuenta"</string>
     <string name="sip_account_list" msgid="5610858485304821480">"Cuentas SIP"</string>
     <string name="saving_account" msgid="5336529880235177448">"Guardando la cuenta..."</string>
     <string name="removing_account" msgid="5537351356808985756">"Eliminando la cuenta..."</string>
diff --git a/sip/res/values-ur-rPK/strings.xml b/sip/res/values-ur-rPK/strings.xml
index 1031dec..3ff39d1 100644
--- a/sip/res/values-ur-rPK/strings.xml
+++ b/sip/res/values-ur-rPK/strings.xml
@@ -63,7 +63,7 @@
     <string name="auth_username_summary" msgid="941160241371436473">"توثیق کیلئے استعمال کردہ صارف نام"</string>
     <string name="default_preference_summary" msgid="1979249643719483249">"‏&lt;سیٹ نہیں ہے&gt;"</string>
     <string name="display_name_summary" msgid="7155076491675565407">"‏&lt;بالکل وہی جو صارف نام ہے&gt;"</string>
-    <string name="optional_summary" msgid="2363105560396317624">"‏‎&lt;‎اختیاری‎&gt;‎"</string>
+    <string name="optional_summary" msgid="2363105560396317624">"‏&lt;اختیاری&gt;"</string>
     <string name="advanced_settings_show" msgid="7838761602853998622">"◁ سبھی کو دکھانے کیلئے ٹچ کریں"</string>
     <string name="advanced_settings_hide" msgid="3480554978705290228">"▽ سبھی کو چھپانے کیلئے ٹچ کریں"</string>
     <string name="empty_alert" msgid="6659484914371384024">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> مطلوب ہے اور خالی نہیں چھوڑا جا سکتا۔"</string>
diff --git a/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java b/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java
index b9ee69d..0a08c61 100644
--- a/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java
+++ b/sip/src/com/android/services/telephony/sip/SipAccountRegistry.java
@@ -113,7 +113,7 @@
     }
 
     void setup(Context context) {
-        startSipProfilesAsync(context, (String) null);
+        startSipProfilesAsync(context, (String) null, false);
 
         // TODO: remove orphaned SIP Accounts
     }
@@ -124,9 +124,10 @@
      *
      * @param context The context.
      * @param sipProfileName The name of the {@link SipProfile} to start, or {@code null} for all.
+     * @param enableProfile Sip account should be enabled
      */
-    void startSipService(Context context, String sipProfileName) {
-        startSipProfilesAsync(context, sipProfileName);
+    void startSipService(Context context, String sipProfileName, boolean enableProfile) {
+        startSipProfilesAsync(context, sipProfileName, enableProfile);
     }
 
     /**
@@ -175,7 +176,7 @@
      * @param context The context.
      */
     public void restartSipService(Context context) {
-        startSipProfiles(context, null);
+        startSipProfiles(context, null, false);
     }
 
     /**
@@ -185,14 +186,16 @@
      *
      * @param context The context.
      * @param sipProfileName Name of the SIP profile.
+     * @param enableProfile Sip account should be enabled.
      */
-    private void startSipProfilesAsync(final Context context, final String sipProfileName) {
+    private void startSipProfilesAsync(
+            final Context context, final String sipProfileName, final boolean enableProfile) {
         if (VERBOSE) log("startSipProfiles, start auto registration");
 
         new Thread(new Runnable() {
             @Override
             public void run() {
-                startSipProfiles(context, sipProfileName);
+                startSipProfiles(context, sipProfileName, enableProfile);
             }}
         ).start();
     }
@@ -204,8 +207,9 @@
      *
      * @param context The context.
      * @param sipProfileName A specific SIP profile Name to start, or {@code null} to start all.
+     * @param enableProfile Sip account should be enabled.
      */
-    private void startSipProfiles(Context context, String sipProfileName) {
+    private void startSipProfiles(Context context, String sipProfileName, boolean enableProfile) {
         final SipSharedPreferences sipSharedPreferences = new SipSharedPreferences(context);
         boolean isReceivingCalls = sipSharedPreferences.isReceivingCallsEnabled();
         String primaryProfile = sipSharedPreferences.getPrimaryAccount();
@@ -220,6 +224,9 @@
             if (sipProfileName == null || sipProfileName.equals(profile.getProfileName())) {
                 PhoneAccount phoneAccount = SipUtil.createPhoneAccount(context, profile);
                 telecomManager.registerPhoneAccount(phoneAccount);
+                if (enableProfile) {
+                    telecomManager.enablePhoneAccount(phoneAccount.getAccountHandle(), true);
+                }
                 startSipServiceForProfile(profile, sipManager, context, isReceivingCalls);
             }
         }
diff --git a/sip/src/com/android/services/telephony/sip/SipConnection.java b/sip/src/com/android/services/telephony/sip/SipConnection.java
index 5df61b7..e9f8e05 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnection.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnection.java
@@ -132,7 +132,8 @@
     public void onHold() {
         if (VERBOSE) log("onHold");
         try {
-            if (getPhone() != null && getState() == STATE_ACTIVE) {
+            if (getPhone() != null && getState() == STATE_ACTIVE
+                    && getPhone().getRingingCall().getState() != Call.State.WAITING) {
                 getPhone().switchHoldingAndActive();
             }
         } catch (CallStateException e) {
diff --git a/sip/src/com/android/services/telephony/sip/SipConnectionService.java b/sip/src/com/android/services/telephony/sip/SipConnectionService.java
index ae21d73..ab4223a 100644
--- a/sip/src/com/android/services/telephony/sip/SipConnectionService.java
+++ b/sip/src/com/android/services/telephony/sip/SipConnectionService.java
@@ -110,8 +110,8 @@
         if (attemptCall) {
             // The ID used for SIP-based phone account is the SIP profile Uri. Use it to find
             // the actual profile.
-            String profileUri = accountHandle.getId();
-            findProfile(profileUri, new IProfileFinderCallback() {
+            String profileName = accountHandle.getId();
+            findProfile(profileName, new IProfileFinderCallback() {
                 @Override
                 public void onFound(SipProfile profile) {
                     if (profile == null) {
@@ -205,7 +205,7 @@
      * in communicating with the database, so it is done asynchronously with a separate thread and a
      * callback interface.
      */
-    private void findProfile(final String profileUri, final IProfileFinderCallback callback) {
+    private void findProfile(final String profileName, final IProfileFinderCallback callback) {
         if (VERBOSE) log("findProfile");
         new Thread(new Runnable() {
             @Override
@@ -214,7 +214,7 @@
                 List<SipProfile> profileList = mSipProfileDb.retrieveSipProfileList();
                 if (profileList != null) {
                     for (SipProfile profile : profileList) {
-                        if (Objects.equals(profileUri, profile.getUriString())) {
+                        if (Objects.equals(profileName, profile.getProfileName())) {
                             profileToUse = profile;
                             break;
                         }
diff --git a/sip/src/com/android/services/telephony/sip/SipEditor.java b/sip/src/com/android/services/telephony/sip/SipEditor.java
index d6f862a..6304220 100644
--- a/sip/src/com/android/services/telephony/sip/SipEditor.java
+++ b/sip/src/com/android/services/telephony/sip/SipEditor.java
@@ -244,12 +244,13 @@
      * {@link android.telecom.PhoneAccount}.
      *
      * @param p The {@link SipProfile} to register.
+     * @param enableProfile {@code true} if profile should be enabled, too.
      * @throws IOException Exception resulting from profile save.
      */
-    private void saveAndRegisterProfile(SipProfile p) throws IOException {
+    private void saveAndRegisterProfile(SipProfile p, boolean enableProfile) throws IOException {
         if (p == null) return;
         mProfileDb.saveProfile(p);
-        mSipAccountRegistry.startSipService(this, p.getProfileName());
+        mSipAccountRegistry.startSipService(this, p.getProfileName(), enableProfile);
     }
 
     /**
@@ -372,7 +373,8 @@
             public void run() {
                 try {
                     deleteAndUnregisterProfile(oldProfile);
-                    saveAndRegisterProfile(newProfile);
+                    boolean autoEnableNewProfile = oldProfile == null;
+                    saveAndRegisterProfile(newProfile, autoEnableNewProfile);
                     finish();
                 } catch (Exception e) {
                     log("replaceProfile, can not save/register new SipProfile, exception: " + e);
diff --git a/sip/src/com/android/services/telephony/sip/SipSettings.java b/sip/src/com/android/services/telephony/sip/SipSettings.java
index 99be70f..76470e5 100644
--- a/sip/src/com/android/services/telephony/sip/SipSettings.java
+++ b/sip/src/com/android/services/telephony/sip/SipSettings.java
@@ -53,6 +53,8 @@
 import java.util.List;
 import java.util.Map;
 
+import com.android.phone.R;
+
 /**
  * The PreferenceActivity class for managing sip profile preferences.
  */
@@ -409,8 +411,9 @@
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        menu.add(0, MENU_ADD_ACCOUNT, 0, R.string.add_sip_account)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        MenuItem addAccountMenuItem = menu.add(0, MENU_ADD_ACCOUNT, 0, R.string.add_sip_account);
+        addAccountMenuItem.setIcon(R.drawable.ic_add_24dp);
+        addAccountMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         return true;
     }
 
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index 3178ae4..d3d9dcf 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -215,7 +215,7 @@
         PersistableBundle carrierConfig =
                 PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
 
-        if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_AUTO_RETRY_ENABLED)) {
+        if (carrierConfig.getBoolean(CarrierConfigManager.KEY_AUTO_RETRY_ENABLED_BOOL)) {
             mButtonAutoRetry.setOnPreferenceChangeListener(this);
             int autoretry = Settings.Global.getInt(
                     getContentResolver(), Settings.Global.CALL_AUTO_RETRY, 0);
@@ -227,7 +227,7 @@
 
         Preference cdmaOptions = prefSet.findPreference(BUTTON_CDMA_OPTIONS);
         Preference gsmOptions = prefSet.findPreference(BUTTON_GSM_UMTS_OPTIONS);
-        if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_WORLD_PHONE)) {
+        if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
             cdmaOptions.setIntent(mSubscriptionInfoHelper.getIntent(CdmaCallOptions.class));
             gsmOptions.setIntent(mSubscriptionInfoHelper.getIntent(GsmUmtsCallOptions.class));
         } else {
@@ -236,21 +236,21 @@
 
             int phoneType = mPhone.getPhoneType();
             Preference fdnButton = prefSet.findPreference(BUTTON_FDN_KEY);
-            boolean shouldHideCarrierSettings = Settings.Global.getInt(
-                    getContentResolver(), Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, 0) == 1;
-            if (shouldHideCarrierSettings) {
+            if (carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)) {
                 prefSet.removePreference(fdnButton);
             } else {
                 if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
                     prefSet.removePreference(fdnButton);
 
-                    if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_VOICE_PRIVACY_DISABLE)) {
+                    if (!carrierConfig.getBoolean(
+                            CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_BOOL)) {
                         addPreferencesFromResource(R.xml.cdma_call_privacy);
                     }
                 } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
                     fdnButton.setIntent(mSubscriptionInfoHelper.getIntent(FdnSetting.class));
 
-                    if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_ADDITIONAL_CALL_SETTING)) {
+                    if (carrierConfig.getBoolean(
+                            CarrierConfigManager.KEY_ADDITIONAL_CALL_SETTING_BOOL)) {
                         addPreferencesFromResource(R.xml.gsm_umts_call_options);
                         GsmUmtsCallOptions.init(prefSet, mSubscriptionInfoHelper);
                     }
diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index 8d29c84..01097f4 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -12,6 +12,8 @@
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -152,7 +154,10 @@
             CharSequence summaryOn;
             final String number = getRawPhoneNumber();
             if (number != null && number.length() > 0) {
-                String values[] = { number };
+                // Wrap the number to preserve presentation in RTL languages.
+                String wrappedNumber = BidiFormatter.getInstance().unicodeWrap(
+                        number, TextDirectionHeuristics.LTR);
+                String values[] = { wrappedNumber };
                 summaryOn = TextUtils.replace(mSummaryOnTemplate, SRC_TAGS, values);
             } else {
                 summaryOn = getContext().getString(R.string.sum_cfu_enabled_no_number);
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 8c22d7a..2cf5276 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -40,9 +40,9 @@
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.UserHandle;
-import android.service.carrier.CarrierConfigService;
 import android.service.carrier.CarrierIdentifier;
-import android.service.carrier.ICarrierConfigService;
+import android.service.carrier.CarrierService;
+import android.service.carrier.ICarrierService;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -65,13 +65,13 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.List;
 
 /**
  * CarrierConfigLoader binds to privileged carrier apps to fetch carrier config overlays.
- * TODO: implement persist cache
  * TODO: handle package install/uninstall events
  */
 
@@ -89,7 +89,7 @@
     // Carrier configs from privileged carrier config app, indexed by phoneID.
     private PersistableBundle[] mConfigFromCarrierApp;
     // Service connection for binding to config app.
-    private ConfigServiceConnection[] mServiceConnection;
+    private CarrierServiceConnection[] mServiceConnection;
 
     // Broadcast receiver for SIM and pkg intents, register intent filter in constructor.
     private final BroadcastReceiver mReceiver = new ConfigLoaderBroadcastReceiver();
@@ -97,10 +97,6 @@
     // Message codes; see mHandler below.
     // Request from SubscriptionInfoUpdater when SIM becomes absent or error.
     private static final int EVENT_CLEAR_CONFIG = 0;
-    // Request from SubscriptionInfoUpdater to update config.
-    private static final int EVENT_UPDATE_CONFIG = 1;
-    // Request from carrier app to reload config.
-    private static final int EVENT_RELOAD_CONFIG = 2;
     // Has connected to default app.
     private static final int EVENT_CONNECTED_TO_DEFAULT = 3;
     // Has connected to carrier app.
@@ -109,6 +105,12 @@
     private static final int EVENT_LOADED_FROM_DEFAULT = 5;
     // Config has been loaded from carrier app.
     private static final int EVENT_LOADED_FROM_CARRIER = 6;
+    // Attempt to fetch from default app or read from XML.
+    private static final int EVENT_FETCH_DEFAULT = 7;
+    // Attempt to fetch from carrier app or read from XML.
+    private static final int EVENT_FETCH_CARRIER = 8;
+    // A package has been installed, uninstalled, or updated.
+    private static final int EVENT_PACKAGE_CHANGED = 9;
 
     // Tags used for saving and restoring XML documents.
     private static final String TAG_DOCUMENT = "carrier_config";
@@ -117,54 +119,84 @@
 
     // Handler to process various events.
     //
-    // For each phoneId, state transition should be: default app bind->connected->loaded, carrier
-    // app (if exists) bind-> connected->loaded. At any time, at most one connection is active.  If
-    // events are not in this order, previous connection will be unbind, so only latest event takes
-    // effect.
+    // For each phoneId, the event sequence should be:
+    //     fetch default, connected to default, loaded from default,
+    //     fetch carrier, connected to carrier, loaded from carrier.
     //
-    // We broadcast config change when:
-    // 1. loaded from carrier app
-    // 2. loaded from default app if no carrier app
-    // 3. config cleared, possibly due to sim removed
-    // 4. bind or IPC error
+    // If there is a saved config file for either the default app or the carrier app, we skip
+    // binding to the app and go straight from fetch to loaded.
+    //
+    // At any time, at most one connection is active. If events are not in this order, previous
+    // connection will be unbound, so only latest event takes effect.
+    //
+    // We broadcast ACTION_CARRIER_CONFIG_CHANGED after:
+    // 1. loading from carrier app (even if read from a file)
+    // 2. loading from default app if there is no carrier app (even if read from a file)
+    // 3. clearing config (e.g. due to sim removal)
+    // 4. encountering bind or IPC error
     private Handler mHandler = new Handler() {
             @Override
         public void handleMessage(Message msg) {
             int phoneId = msg.arg1;
             log("mHandler: " + msg.what + " phoneId: " + phoneId);
+            String iccid;
             CarrierIdentifier carrierId;
-            ConfigServiceConnection conn;
+            String carrierPackageName;
+            CarrierServiceConnection conn;
             PersistableBundle config;
             switch (msg.what) {
                 case EVENT_CLEAR_CONFIG:
+                    if (mConfigFromDefaultApp[phoneId] == null &&
+                        mConfigFromCarrierApp[phoneId] == null)
+                        break;
                     mConfigFromDefaultApp[phoneId] = null;
                     mConfigFromCarrierApp[phoneId] = null;
                     mServiceConnection[phoneId] = null;
                     broadcastConfigChangedIntent(phoneId);
                     break;
-                case EVENT_UPDATE_CONFIG:
-                    // Use persist cache to avoid loading from app.
-                    // Fall through to next event if cache not hit.
-                case EVENT_RELOAD_CONFIG:
-                    if (!bindToConfigPackage(DEFAULT_CARRIER_CONFIG_PACKAGE,
-                            phoneId, EVENT_CONNECTED_TO_DEFAULT)) {
-                        // Send bcast if bind fails
-                        broadcastConfigChangedIntent(phoneId);
+
+                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);
+                    }
+                    break;
+
+                case EVENT_FETCH_DEFAULT:
+                    iccid = getIccIdForPhoneId(phoneId);
+                    config = restoreConfigFromXml(DEFAULT_CARRIER_CONFIG_PACKAGE, iccid);
+                    if (config != null) {
+                        log("Loaded config from XML. package=" + DEFAULT_CARRIER_CONFIG_PACKAGE
+                                + " phoneId=" + phoneId);
+                        mConfigFromDefaultApp[phoneId] = config;
+                        Message newMsg = obtainMessage(EVENT_LOADED_FROM_DEFAULT, phoneId, -1);
+                        newMsg.getData().putBoolean("loaded_from_xml", true);
+                        mHandler.sendMessage(newMsg);
+                    } else {
+                        if (!bindToConfigPackage(DEFAULT_CARRIER_CONFIG_PACKAGE,
+                                phoneId, EVENT_CONNECTED_TO_DEFAULT)) {
+                            // Send bcast if bind fails
+                            broadcastConfigChangedIntent(phoneId);
+                        }
                     }
                     break;
 
                 case EVENT_CONNECTED_TO_DEFAULT:
                     carrierId = getCarrierIdForPhoneId(phoneId);
-                    conn = (ConfigServiceConnection) msg.obj;
+                    conn = (CarrierServiceConnection) msg.obj;
                     // If new service connection has been created, unbind.
                     if (mServiceConnection[phoneId] != conn || conn.service == null) {
                         mContext.unbindService(conn);
                         break;
                     }
                     try {
-                        ICarrierConfigService configService = ICarrierConfigService.Stub
+                        ICarrierService carrierService = ICarrierService.Stub
                                 .asInterface(conn.service);
-                        config = configService.getCarrierConfig(carrierId);
+                        config = carrierService.getCarrierConfig(carrierId);
+                        iccid = getIccIdForPhoneId(phoneId);
+                        saveConfigToXml(DEFAULT_CARRIER_CONFIG_PACKAGE, iccid, config);
                         mConfigFromDefaultApp[phoneId] = config;
                         sendMessage(obtainMessage(EVENT_LOADED_FROM_DEFAULT, phoneId, -1));
                     } catch (RemoteException ex) {
@@ -175,26 +207,44 @@
                     break;
 
                 case EVENT_LOADED_FROM_DEFAULT:
-                    if (mServiceConnection[phoneId] == null) {
+                    // If we attempted to bind to the app, but the service connection is null, then
+                    // config was cleared while we were waiting and we should not continue.
+                    if (!msg.getData().getBoolean("loaded_from_xml", false)
+                            && mServiceConnection[phoneId] == null) {
                         break;
                     }
-                    List<String> carrierPackageNames = TelephonyManager.from(mContext)
-                            .getCarrierPackageNamesForIntentAndPhone(
-                                    new Intent(CarrierConfigService.SERVICE_INTERFACE), phoneId);
-                    log("Found carrier config app: " + carrierPackageNames);
-                    if (carrierPackageNames != null && carrierPackageNames.size() > 0) {
-                        if (!bindToConfigPackage(carrierPackageNames.get(0),
-                                phoneId, EVENT_CONNECTED_TO_CARRIER)) {
-                            broadcastConfigChangedIntent(phoneId);
-                        }
+                    carrierPackageName = getCarrierPackageForPhoneId(phoneId);
+                    if (carrierPackageName != null) {
+                        log("Found carrier config app: " + carrierPackageName);
+                        sendMessage(obtainMessage(EVENT_FETCH_CARRIER, phoneId));
                     } else {
                         broadcastConfigChangedIntent(phoneId);
                     }
                     break;
 
+                case EVENT_FETCH_CARRIER:
+                    carrierPackageName = getCarrierPackageForPhoneId(phoneId);
+                    iccid = getIccIdForPhoneId(phoneId);
+                    config = restoreConfigFromXml(carrierPackageName, iccid);
+                    if (config != null) {
+                        log("Loaded config from XML. package=" + carrierPackageName + " phoneId="
+                                + phoneId);
+                        mConfigFromCarrierApp[phoneId] = config;
+                        Message newMsg = obtainMessage(EVENT_LOADED_FROM_CARRIER, phoneId, -1);
+                        newMsg.getData().putBoolean("loaded_from_xml", true);
+                        sendMessage(newMsg);
+                    } else {
+                        if (!bindToConfigPackage(carrierPackageName, phoneId,
+                                EVENT_CONNECTED_TO_CARRIER)) {
+                            // Send bcast if bind fails
+                            broadcastConfigChangedIntent(phoneId);
+                        }
+                    }
+                    break;
+
                 case EVENT_CONNECTED_TO_CARRIER:
                     carrierId = getCarrierIdForPhoneId(phoneId);
-                    conn = (ConfigServiceConnection) msg.obj;
+                    conn = (CarrierServiceConnection) msg.obj;
                     // If new service connection has been created, unbind.
                     if (mServiceConnection[phoneId] != conn ||
                             conn.service == null) {
@@ -202,9 +252,12 @@
                         break;
                     }
                     try {
-                        ICarrierConfigService configService = ICarrierConfigService.Stub
+                        ICarrierService carrierService = ICarrierService.Stub
                                 .asInterface(conn.service);
-                        config = configService.getCarrierConfig(carrierId);
+                        config = carrierService.getCarrierConfig(carrierId);
+                        carrierPackageName = getCarrierPackageForPhoneId(phoneId);
+                        iccid = getIccIdForPhoneId(phoneId);
+                        saveConfigToXml(carrierPackageName, iccid, config);
                         mConfigFromCarrierApp[phoneId] = config;
                         sendMessage(obtainMessage(EVENT_LOADED_FROM_CARRIER, phoneId, -1));
                     } catch (RemoteException ex) {
@@ -215,7 +268,10 @@
                     break;
 
                 case EVENT_LOADED_FROM_CARRIER:
-                    if (mServiceConnection[phoneId] == null) {
+                    // If we attempted to bind to the app, but the service connection is null, then
+                    // config was cleared while we were waiting and we should not continue.
+                    if (!msg.getData().getBoolean("loaded_from_xml", false)
+                            && mServiceConnection[phoneId] == null) {
                         break;
                     }
                     broadcastConfigChangedIntent(phoneId);
@@ -241,7 +297,7 @@
         int numPhones = TelephonyManager.from(context).getPhoneCount();
         mConfigFromDefaultApp = new PersistableBundle[numPhones];
         mConfigFromCarrierApp = new PersistableBundle[numPhones];
-        mServiceConnection = new ConfigServiceConnection[numPhones];
+        mServiceConnection = new CarrierServiceConnection[numPhones];
         // Make this service available through ServiceManager.
         ServiceManager.addService(Context.CARRIER_CONFIG_SERVICE, this);
         log("CarrierConfigLoader has started");
@@ -275,11 +331,11 @@
     /** 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 carrierConfigService = new Intent(CarrierConfigService.SERVICE_INTERFACE);
-        carrierConfigService.setPackage(pkgName);
-        mServiceConnection[phoneId] = new ConfigServiceConnection(phoneId, eventId);
+        Intent carrierService = new Intent(CarrierService.CONFIG_SERVICE_INTERFACE);
+        carrierService.setPackage(pkgName);
+        mServiceConnection[phoneId] = new CarrierServiceConnection(phoneId, eventId);
         try {
-            return mContext.bindService(carrierConfigService, mServiceConnection[phoneId],
+            return mContext.bindService(carrierService, mServiceConnection[phoneId],
                     Context.BIND_AUTO_CREATE);
         } catch (SecurityException ex) {
             return false;
@@ -309,18 +365,51 @@
         return new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, gid2);
     }
 
+    /** Returns the package name of a priveleged carrier app, or null if there is none. */
+    private String getCarrierPackageForPhoneId(int phoneId) {
+        List<String> carrierPackageNames = TelephonyManager.from(mContext)
+                .getCarrierPackageNamesForIntentAndPhone(
+                        new Intent(CarrierService.CONFIG_SERVICE_INTERFACE), phoneId);
+        if (carrierPackageNames != null && carrierPackageNames.size() > 0) {
+            return carrierPackageNames.get(0);
+        } else {
+            return null;
+        }
+    }
+
+    private String getIccIdForPhoneId(int phoneId) {
+        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
+            return null;
+        }
+        Phone phone = PhoneFactory.getPhone(phoneId);
+        if (phone == null) {
+            return null;
+        }
+        return phone.getIccSerialNumber();
+    }
+
     /**
      * Writes a bundle to an XML file.
      *
      * The bundle will be written to a file named after the package name and ICCID, so that it can
      * be restored later with {@link @restoreConfigFromXml}. The XML output will include the bundle
-     * and the current version of the specified package. In case of errors, no file will be written.
+     * and the current version of the specified package.
+     *
+     * In case of errors or invalid input, no file will be written.
      *
      * @param packageName the name of the package from which we fetched this bundle.
      * @param iccid the ICCID of the subscription for which this bundle was fetched.
-     * @param config the bundle to be written.
+     * @param config the bundle to be written. Null will be treated as an empty bundle.
      */
     private void saveConfigToXml(String packageName, String iccid, PersistableBundle config) {
+        if (packageName == null || iccid == null) {
+            loge("Cannot save config with null packageName or iccid.");
+            return;
+        }
+        if (config == null) {
+          config = new PersistableBundle();
+        }
+
         final String version = getPackageVersion(packageName);
         if (version == null) {
             loge("Failed to get package version for: " + packageName);
@@ -358,8 +447,10 @@
      * Reads a bundle from an XML file.
      *
      * This restores a bundle that was written with {@link #saveConfigToXml}. This returns the saved
-     * config bundle for the given package and ICCID. If the saved config is for a different package
-     * version than the current version, then null will be returned.
+     * config bundle for the given package and ICCID.
+     *
+     * In case of errors, or if the saved config is from a different package version than the
+     * current version, then null will be returned.
      *
      * @param packageName the name of the package from which we fetched this bundle.
      * @param iccid the ICCID of the subscription for which this bundle was fetched.
@@ -372,6 +463,10 @@
             loge("Failed to get package version for: " + packageName);
             return null;
         }
+        if (packageName == null || iccid == null) {
+            loge("Cannot restore config with null packageName or iccid.");
+            return null;
+        }
 
         PersistableBundle restoredBundle = null;
         FileInputStream inFile = null;
@@ -411,23 +506,48 @@
         return restoredBundle;
     }
 
+    /** Deletes all saved XML files associated with the given package name. */
+    private void deleteConfigForPackage(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 + "-");
+            }
+        });
+        for (File f : packageFiles) {
+            log("deleting " + f.getName());
+            f.delete();
+        }
+    }
+
     /** Builds a canonical file name for a config file. */
-    private String getFilenameForConfig(String packageName, String iccid) {
+    private String getFilenameForConfig(@NonNull String packageName, @NonNull String iccid) {
         return "carrierconfig-" + packageName + "-" + iccid + ".xml";
     }
 
-    /** Return the current version of a package, or null if the name is not found. */
+    /** Return the current version code of a package, or null if the name is not found. */
     private String getPackageVersion(String packageName) {
         try {
             PackageInfo info = mContext.getPackageManager().getPackageInfo(packageName, 0);
-            return info.versionName;
+            return Integer.toString(info.versionCode);
         } catch (PackageManager.NameNotFoundException e) {
             return null;
         }
     }
 
-    @Override
-    public @NonNull PersistableBundle getConfigForSubId(int subId) {
+    /** Read up to date config.
+     *
+     * This reads config bundles for the given phoneId. That means getting the latest bundle from
+     * the default app and a privileged carrier app, if present. This will not bind to an app if we
+     * have a saved config file to use instead.
+     */
+    private void updateConfigForPhoneId(int phoneId) {
+        mHandler.sendMessage(mHandler.obtainMessage(EVENT_FETCH_DEFAULT, phoneId, -1));
+    }
+
+    @Override public
+    @NonNull
+    PersistableBundle getConfigForSubId(int subId) {
         int phoneId = SubscriptionManager.getPhoneId(subId);
         PersistableBundle retConfig = CarrierConfigManager.getDefaultConfig();
         if (SubscriptionManager.isValidPhoneId(phoneId)) {
@@ -442,13 +562,27 @@
     }
 
     @Override
-    public void reloadCarrierConfigForSubId(int subId) {
+    public void notifyConfigChangedForSubId(int subId) {
         int phoneId = SubscriptionManager.getPhoneId(subId);
-        if (SubscriptionManager.isValidPhoneId(phoneId)) {
-            mHandler.sendMessage(mHandler.obtainMessage(EVENT_RELOAD_CONFIG, phoneId, -1));
-        } else {
+        if (!SubscriptionManager.isValidPhoneId(phoneId)) {
             log("Ignore invalid phoneId: " + phoneId + " for subId: " + subId);
+            return;
         }
+        String callingPackageName = mContext.getPackageManager().getNameForUid(
+                Binder.getCallingUid());
+        // TODO: Check that the calling packages is privileged for subId specifically.
+        int privilegeStatus = TelephonyManager.from(mContext).checkCarrierPrivilegesForPackage(
+                callingPackageName);
+        if (privilegeStatus != TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
+            throw new SecurityException(
+                    "Package is not privileged for subId=" + subId + ": " + callingPackageName);
+        }
+
+        // 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);
+        updateConfigForPhoneId(phoneId);
     }
 
     @Override
@@ -466,7 +600,7 @@
                 break;
             case IccCardConstants.INTENT_VALUE_ICC_LOADED:
             case IccCardConstants.INTENT_VALUE_ICC_LOCKED:
-                mHandler.sendMessage(mHandler.obtainMessage(EVENT_UPDATE_CONFIG, phoneId, -1));
+                updateConfigForPhoneId(phoneId);
                 break;
         }
     }
@@ -487,12 +621,12 @@
         }
     }
 
-    private class ConfigServiceConnection implements ServiceConnection {
+    private class CarrierServiceConnection implements ServiceConnection {
         int phoneId;
         int eventId;
         IBinder service;
 
-        public ConfigServiceConnection(int phoneId, int eventId) {
+        public CarrierServiceConnection(int phoneId, int eventId) {
             this.phoneId = phoneId;
             this.eventId = eventId;
         }
@@ -515,6 +649,18 @@
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             log("Receive action: " + action);
+            switch (action) {
+                case Intent.ACTION_PACKAGE_ADDED:
+                case Intent.ACTION_PACKAGE_CHANGED:
+                case Intent.ACTION_PACKAGE_REMOVED:
+                    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));
+                    break;
+
+            }
         }
     }
 
diff --git a/src/com/android/phone/CdmaCallOptions.java b/src/com/android/phone/CdmaCallOptions.java
index 7d8c991..9131ad6 100644
--- a/src/com/android/phone/CdmaCallOptions.java
+++ b/src/com/android/phone/CdmaCallOptions.java
@@ -59,7 +59,7 @@
             carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
         }
         if (subInfoHelper.getPhone().getPhoneType() != PhoneConstants.PHONE_TYPE_CDMA
-                || carrierConfig.getBoolean(CarrierConfigManager.BOOL_VOICE_PRIVACY_DISABLE)) {
+                || carrierConfig.getBoolean(CarrierConfigManager.KEY_VOICE_PRIVACY_DISABLE_BOOL)) {
             // disable the entire screen
             getPreferenceScreen().setEnabled(false);
         }
diff --git a/src/com/android/phone/CdmaOptions.java b/src/com/android/phone/CdmaOptions.java
index 76753fc..eabbdd2 100644
--- a/src/com/android/phone/CdmaOptions.java
+++ b/src/com/android/phone/CdmaOptions.java
@@ -66,9 +66,11 @@
 
         mButtonAPNExpand = (PreferenceScreen) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);
         boolean removedAPNExpand = false;
-        PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
+        PersistableBundle carrierConfig =
+                PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
         // Some CDMA carriers want the APN settings.
-        if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_APN_SETTING_CDMA) && mButtonAPNExpand != null) {
+        if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL)
+                && mButtonAPNExpand != null) {
             mPrefScreen.removePreference(mButtonAPNExpand);
             removedAPNExpand = true;
         }
@@ -118,7 +120,7 @@
 
         // Read platform settings for carrier settings
         final boolean isCarrierSettingsEnabled = carrierConfig.getBoolean(
-                CarrierConfigManager.BOOL_CARRIER_SETTINGS_ENABLE);
+                CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL);
         if (!isCarrierSettingsEnabled) {
             Preference pref = mPrefScreen.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
             if (pref != null) {
diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
index b8d17c9..2d70d01 100644
--- a/src/com/android/phone/EmergencyActionGroup.java
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -76,7 +76,6 @@
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
-
         setupAssistActions();
 
         mSelectedContainer = (ViewGroup) findViewById(R.id.selected_container);
@@ -119,7 +118,13 @@
     private void setupAssistActions() {
         int[] buttonIds = new int[] {R.id.action1, R.id.action2, R.id.action3};
 
-        List<ResolveInfo> infos = resolveAssistPackageAndQueryActivites();
+        List<ResolveInfo> infos;
+
+        if (TelephonyManager.EMERGENCY_ASSISTANCE_ENABLED) {
+            infos = resolveAssistPackageAndQueryActivites();
+        } else {
+            infos = null;
+        }
 
         for (int i = 0; i < 3; i++) {
             Button button = (Button) findViewById(buttonIds[i]);
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 93760d2..71557c6 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -201,13 +201,12 @@
 
         // Check whether we should show the onscreen "Dial" button and co.
         PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
-        if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_ONSCREEN_DIAL_BUTTON)) {
+        if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL)) {
             mDialButton.setOnClickListener(this);
         } else {
             mDialButton.setVisibility(View.GONE);
         }
-        View floatingActionButtonContainer = findViewById(R.id.floating_action_button_container);
-        ViewUtil.setupFloatingActionButton(floatingActionButtonContainer, getResources());
+        ViewUtil.setupFloatingActionButton(mDialButton, getResources());
 
         if (icicle != null) {
             super.onRestoreInstanceState(icicle);
@@ -240,7 +239,10 @@
         registerReceiver(mBroadcastReceiver, intentFilter);
 
         try {
-            mHaptic.init(this, carrierConfig.getBoolean(CarrierConfigManager.BOOL_ENABLE_DIALER_KEY_VIBRATION));
+            mHaptic.init(
+                    this,
+                    carrierConfig.getBoolean(
+                            CarrierConfigManager.KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL));
         } catch (Resources.NotFoundException nfe) {
              Log.e(LOG_TAG, "Vibrate control bool missing.", nfe);
         }
diff --git a/src/com/android/phone/GsmUmtsOptions.java b/src/com/android/phone/GsmUmtsOptions.java
index 24dfb74..df5f2cd 100644
--- a/src/com/android/phone/GsmUmtsOptions.java
+++ b/src/com/android/phone/GsmUmtsOptions.java
@@ -66,18 +66,21 @@
         } else {
             log("Not a CDMA phone");
             Resources res = mPrefActivity.getResources();
-            PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfigForSubId(mSubId);
+            PersistableBundle carrierConfig =
+                    PhoneGlobals.getInstance().getCarrierConfigForSubId(mSubId);
 
             // Determine which options to display. For GSM these are defaulted to true in
             // CarrierConfigManager, but they maybe overriden by DefaultCarrierConfigService or a
             // carrier app.
             // Note: these settings used to be controlled with overlays in
             // Telephony/res/values/config.xml
-            if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_APN_EXPAND) && mButtonAPNExpand != null) {
+            if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL)
+                    && mButtonAPNExpand != null) {
                 mPrefScreen.removePreference(mButtonAPNExpand);
                 removedAPNExpand = true;
             }
-            if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_OPERATOR_SELECTION_EXPAND)) {
+            if (!carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL)) {
                 mPrefScreen.removePreference(mPrefScreen
                         .findPreference(BUTTON_OPERATOR_SELECTION_EXPAND_KEY));
             }
@@ -95,7 +98,7 @@
 
             // Read platform settings for carrier settings
             final boolean isCarrierSettingsEnabled = carrierConfig.getBoolean(
-                CarrierConfigManager.BOOL_CARRIER_SETTINGS_ENABLE);
+                CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL);
             if (!isCarrierSettingsEnabled) {
                 Preference pref = mPrefScreen.findPreference(BUTTON_CARRIER_SETTINGS_KEY);
                 if (pref != null) {
diff --git a/src/com/android/phone/IccNetworkDepersonalizationPanel.java b/src/com/android/phone/IccNetworkDepersonalizationPanel.java
index b241c3c..34153c8 100644
--- a/src/com/android/phone/IccNetworkDepersonalizationPanel.java
+++ b/src/com/android/phone/IccNetworkDepersonalizationPanel.java
@@ -138,7 +138,8 @@
         // based on the "sim_network_unlock_allow_dismiss" resource.
         mDismissButton = (Button) findViewById(R.id.ndp_dismiss);
         PersistableBundle carrierConfig = PhoneGlobals.getInstance().getCarrierConfig();
-        if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_SIM_NETWORK_UNLOCK_ALLOW_DISMISS)) {
+        if (carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL)) {
             if (DBG) log("Enabling 'Dismiss' button...");
             mDismissButton.setVisibility(View.VISIBLE);
             mDismissButton.setOnClickListener(mDismissListener);
diff --git a/src/com/android/phone/InCallScreenShowActivation.java b/src/com/android/phone/InCallScreenShowActivation.java
index 64d2aa6..b3df183 100644
--- a/src/com/android/phone/InCallScreenShowActivation.java
+++ b/src/com/android/phone/InCallScreenShowActivation.java
@@ -74,7 +74,8 @@
         if (intent.getAction().equals(OtaUtils.ACTION_PERFORM_CDMA_PROVISIONING)) {
 
             PersistableBundle carrierConfig = app.getCarrierConfig();
-            boolean usesHfa = carrierConfig.getBoolean(CarrierConfigManager.BOOL_USE_HFA_FOR_PROVISIONING);
+            boolean usesHfa = carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_USE_HFA_FOR_PROVISIONING_BOOL);
             if (usesHfa) {
                 Log.i(LOG_TAG, "Starting Hfa from ACTION_PERFORM_CDMA_PROVISIONING");
                 startHfa();
@@ -82,7 +83,8 @@
                 return;
             }
 
-            boolean usesOtasp = carrierConfig.getBoolean(CarrierConfigManager.BOOL_USE_OTASP_FOR_PROVISIONING);
+            boolean usesOtasp = carrierConfig.getBoolean(
+                    CarrierConfigManager.KEY_USE_OTASP_FOR_PROVISIONING_BOOL);
             if (usesOtasp) {
                 // On voice-capable devices, we perform CDMA provisioning in
                 // "interactive" mode by directly launching the InCallScreen.
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index df94023..96d00ae 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -540,15 +540,12 @@
         PersistableBundle carrierConfig =
                 PhoneGlobals.getInstance().getCarrierConfigForSubId(mPhone.getSubId());
         mIsGlobalCdma = isLteOnCdma
-                && carrierConfig.getBoolean(CarrierConfigManager.BOOL_SHOW_CDMA_CHOICES);
-        int shouldHideCarrierSettings = android.provider.Settings.Global.getInt(
-                mPhone.getContext().getContentResolver(),
-                android.provider.Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, 0);
-        if (shouldHideCarrierSettings == 1) {
+                && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
+        if (carrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)) {
             prefSet.removePreference(mButtonPreferredNetworkMode);
             prefSet.removePreference(mButtonEnabledNetworks);
             prefSet.removePreference(mLteDataServicePref);
-        } else if (carrierConfig.getBoolean(CarrierConfigManager.BOOL_WORLD_PHONE) == true) {
+        } else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL) == true) {
             prefSet.removePreference(mButtonEnabledNetworks);
             // set the listener for the mButtonPreferredNetworkMode list preference so we can issue
             // change Preferred Network Mode.
@@ -606,13 +603,13 @@
                     mGsmUmtsOptions = null;
                 }
             } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
-                if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_PREFER_2G)
+                if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)
                         && !getResources().getBoolean(R.bool.config_enabled_lte)) {
                     mButtonEnabledNetworks.setEntries(
                             R.array.enabled_networks_except_gsm_lte_choices);
                     mButtonEnabledNetworks.setEntryValues(
                             R.array.enabled_networks_except_gsm_lte_values);
-                } else if (!carrierConfig.getBoolean(CarrierConfigManager.BOOL_PREFER_2G)) {
+                } else if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)) {
                     int select = (mShow4GForLTE == true) ?
                             R.array.enabled_networks_except_gsm_4g_choices
                             : R.array.enabled_networks_except_gsm_choices;
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 54dfb75..885b797 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -52,6 +52,7 @@
 import com.android.internal.telephony.PhoneBase;
 import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.phone.settings.VoicemailSettingsActivity;
+import com.android.phone.vvm.omtp.sync.VoicemailStatusQueryHelper;
 import com.android.phone.settings.VoicemailNotificationSettingsUtil;
 import com.android.phone.settings.VoicemailProviderSettingsUtil;
 
@@ -299,11 +300,20 @@
             return;
         }
 
+        Phone phone = PhoneGlobals.getPhone(subId);
+        if (visible && phone != null) {
+            VoicemailStatusQueryHelper queryHelper = new VoicemailStatusQueryHelper(mContext);
+            PhoneAccountHandle phoneAccount = PhoneUtils.makePstnPhoneAccountHandle(phone);
+            if (queryHelper.isNotificationsChannelActive(phoneAccount)) {
+                Log.v(LOG_TAG, "Notifications channel active for visual voicemail, hiding mwi.");
+                visible = false;
+            }
+        }
+
         Log.i(LOG_TAG, "updateMwi(): subId " + subId + " update to " + visible);
         mMwiVisible.put(subId, visible);
 
         if (visible) {
-            Phone phone = PhoneGlobals.getPhone(subId);
             if (phone == null) {
                 Log.w(LOG_TAG, "Found null phone for: " + subId);
                 return;
@@ -399,7 +409,7 @@
                     .setSound(ringtoneUri)
                     .setColor(res.getColor(R.color.dialer_theme_color))
                     .setOngoing(carrierConfig.getBoolean(
-                            CarrierConfigManager.BOOL_VOICEMAIL_NOTIFICATION_PERSISTENT));
+                            CarrierConfigManager.KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL));
 
             if (VoicemailNotificationSettingsUtil.isVibrationEnabled(phone)) {
                 builder.setDefaults(Notification.DEFAULT_VIBRATE);
diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 8b0b8a9..eb9ea15 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -159,7 +159,7 @@
     static int mDockState = Intent.EXTRA_DOCK_STATE_UNDOCKED;
     static boolean sVoiceCapable = true;
 
-    // Internal PhoneApp Call state tracker
+    // TODO: Remove, no longer used.
     CdmaPhoneCallState cdmaPhoneCallState;
 
     // The currently-active PUK entry activity and progress dialog.
@@ -240,7 +240,8 @@
                 // TODO: This event should be handled by the lock screen, just
                 // like the "SIM missing" and "Sim locked" cases (bug 1804111).
                 case EVENT_SIM_NETWORK_LOCKED:
-                    if (getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_IGNORE_SIM_NETWORK_LOCKED_EVENTS)) {
+                    if (getCarrierConfig().getBoolean(
+                            CarrierConfigManager.KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL)) {
                         // Some products don't have the concept of a "SIM network lock"
                         Log.i(LOG_TAG, "Ignoring EVENT_SIM_NETWORK_LOCKED event; "
                               + "not showing 'SIM network unlock' PIN entry screen");
@@ -780,14 +781,8 @@
         if (DBG) Log.d(LOG_TAG, "initForNewRadioTechnology...");
 
         final Phone phone = PhoneFactory.getPhone(phoneId);
-
-        if (phone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
-            // Create an instance of CdmaPhoneCallState and initialize it to IDLE
-            cdmaPhoneCallState = new CdmaPhoneCallState();
-            cdmaPhoneCallState.CdmaPhoneCallStateInit();
-        }
-        if (!TelephonyCapabilities.supportsOtasp(phone)) {
-            //Clean up OTA data in GSM/UMTS. It is valid only for CDMA
+        if (phone == null || !TelephonyCapabilities.supportsOtasp(phone)) {
+            // Clean up OTA for non-CDMA since it is only valid for CDMA.
             clearOtaState();
         }
 
@@ -795,7 +790,7 @@
         callStateMonitor.updateAfterRadioTechnologyChange();
 
         // Update registration for ICC status after radio technology change
-        IccCard sim = phone.getIccCard();
+        IccCard sim = phone == null ? null : phone.getIccCard();
         if (sim != null) {
             if (DBG) Log.d(LOG_TAG, "Update registration for ICC status...");
 
@@ -830,6 +825,7 @@
                 }
                 Phone phone = SubscriptionManager.isValidPhoneId(phoneId) ?
                         PhoneFactory.getPhone(phoneId) : PhoneFactory.getDefaultPhone();
+
                 // The "data disconnected due to roaming" notification is shown
                 // if (a) you have the "data roaming" feature turned off, and
                 // (b) you just lost data connectivity because you're roaming.
@@ -916,11 +912,13 @@
          */
 
         // If service just returned, start sending out the queued messages
-        ServiceState ss = ServiceState.newFromBundle(intent.getExtras());
-
-        if (ss != null) {
-            int state = ss.getState();
-            notificationMgr.updateNetworkSelection(state);
+        Bundle extras = intent.getExtras();
+        if (extras != null) {
+            ServiceState ss = ServiceState.newFromBundle(extras);
+            if (ss != null) {
+                int state = ss.getState();
+                notificationMgr.updateNetworkSelection(state);
+            }
         }
     }
 
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index e4b8c35..25e25be 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -33,6 +33,7 @@
 import android.os.Process;
 import android.os.ServiceManager;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.telecom.PhoneAccount;
@@ -46,6 +47,7 @@
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.telephony.ModemActivityInfo;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
@@ -59,6 +61,7 @@
 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.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.ProxyController;
@@ -78,6 +81,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
@@ -126,6 +130,9 @@
     private static final int EVENT_SET_VOICEMAIL_NUMBER_DONE = 34;
     private static final int CMD_SET_NETWORK_SELECTION_MODE_AUTOMATIC = 35;
     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;
+
 
     /** The singleton instance. */
     private static PhoneInterfaceManager sInstance;
@@ -133,6 +140,7 @@
     private PhoneGlobals mApp;
     private Phone mPhone;
     private CallManager mCM;
+    private UserManager mUserManager;
     private AppOpsManager mAppOps;
     private MainThreadHandler mMainThreadHandler;
     private SubscriptionController mSubscriptionController;
@@ -261,7 +269,12 @@
                     request = (MainThreadRequest) msg.obj;
                     int end_subId = request.subId;
                     final boolean hungUp;
-                    int phoneType = getPhone(end_subId).getPhoneType();
+                    Phone phone = getPhone(end_subId);
+                    if (phone == null) {
+                        if (DBG) log("CMD_END_CALL: no phone for id: " + end_subId);
+                        break;
+                    }
+                    int phoneType = phone.getPhoneType();
                     if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
                         // CDMA: If the user presses the Power button we treat it as
                         // ending the complete call session
@@ -464,10 +477,12 @@
                         }
 
                         int errorCode = IccOpenLogicalChannelResponse.STATUS_UNKNOWN_ERROR;
-                        if ((ar.exception != null) && (ar.exception instanceof CommandException)) {
-                            if (ar.exception.getMessage().compareTo("MISSING_RESOURCE") == 0) {
+                        if (ar.exception instanceof CommandException) {
+                            CommandException.Error error =
+                                ((CommandException) (ar.exception)).getCommandError();
+                            if (error == CommandException.Error.MISSING_RESOURCE) {
                                 errorCode = IccOpenLogicalChannelResponse.STATUS_MISSING_RESOURCE;
-                            } else if (ar.exception.getMessage().compareTo("NO_SUCH_ELEMENT") == 0) {
+                            } else if (error == CommandException.Error.NO_SUCH_ELEMENT) {
                                 errorCode = IccOpenLogicalChannelResponse.STATUS_NO_SUCH_ELEMENT;
                             }
                         }
@@ -632,6 +647,32 @@
                     handleNullReturnEvent(msg, "setNetworkSelectionModeAutomatic");
                     break;
 
+                case CMD_GET_MODEM_ACTIVITY_INFO:
+                    request = (MainThreadRequest) msg.obj;
+                    onCompleted = obtainMessage(EVENT_GET_MODEM_ACTIVITY_INFO_DONE, request);
+                    mPhone.getModemActivityInfo(onCompleted);
+                    break;
+
+                case EVENT_GET_MODEM_ACTIVITY_INFO_DONE:
+                    ar = (AsyncResult) msg.obj;
+                    request = (MainThreadRequest) ar.userObj;
+                    if (ar.exception == null && ar.result != null) {
+                        request.result = ar.result;
+                    } else {
+                        if (ar.result == null) {
+                            loge("queryModemActivityInfo: Empty response");
+                        } else if (ar.exception instanceof CommandException) {
+                            loge("queryModemActivityInfo: CommandException: " +
+                                    ar.exception);
+                        } else {
+                            loge("queryModemActivityInfo: Unknown exception");
+                        }
+                    }
+                    synchronized (request) {
+                        request.notifyAll();
+                    }
+                    break;
+
                 default:
                     Log.w(LOG_TAG, "MainThreadHandler: unexpected message code: " + msg.what);
                     break;
@@ -733,6 +774,7 @@
         mApp = app;
         mPhone = phone;
         mCM = PhoneGlobals.getInstance().mCM;
+        mUserManager = (UserManager) app.getSystemService(Context.USER_SERVICE);
         mAppOps = (AppOpsManager)app.getSystemService(Context.APP_OPS_SERVICE);
         mMainThreadHandler = new MainThreadHandler();
         mTelephonySharedPreferences =
@@ -807,16 +849,7 @@
         }
 
         boolean isValid = false;
-        List<SubscriptionInfo> slist;
-
-        final long identity = Binder.clearCallingIdentity();
-        try {
-            slist = mSubscriptionController.getActiveSubscriptionInfoList(
-                    mPhone.getContext().getOpPackageName());
-        } finally {
-             Binder.restoreCallingIdentity(identity);
-        }
-
+        final List<SubscriptionInfo> slist = getActiveSubscriptionInfoList();
         if (slist != null) {
             for (SubscriptionInfo subInfoRecord : slist) {
                 if (subInfoRecord.getSubscriptionId() == subId) {
@@ -1220,6 +1253,7 @@
         // OP_COARSE_LOCATION controls both fine and coarse location.
         if (mAppOps.noteOp(AppOpsManager.OP_COARSE_LOCATION, Binder.getCallingUid(),
                 callingPackage) != AppOpsManager.MODE_ALLOWED) {
+            log("getCellLocation: returning null; mode != allowed");
             return null;
         }
 
@@ -1230,7 +1264,7 @@
             phone.getCellLocation().fillInNotifierBundle(data);
             return data;
         } else {
-            if (DBG_LOC) log("getCellLocation: suppress non-active user");
+            log("getCellLocation: suppress non-active user");
             return null;
         }
     }
@@ -2038,13 +2072,33 @@
     }
 
     @Override
-    public int checkCarrierPrivilegesForPackage(String pkgname) {
+    public int checkCarrierPrivilegesForPackage(String pkgName) {
         UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
         if (card == null) {
             loge("checkCarrierPrivilegesForPackage: No UICC");
             return TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
         }
-        return card.getCarrierPrivilegeStatus(mPhone.getContext().getPackageManager(), pkgname);
+        return card.getCarrierPrivilegeStatus(mPhone.getContext().getPackageManager(), pkgName);
+    }
+
+    @Override
+    public int checkCarrierPrivilegesForPackageAnyPhone(String pkgName) {
+        int result = TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
+        for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
+            UiccCard card = UiccController.getInstance().getUiccCard(i);
+            if (card == null) {
+              loge("checkCarrierPrivilegesForPackageAnyPhones: No UICC");
+              continue;
+            }
+
+            result = card.getCarrierPrivilegeStatus(
+                mPhone.getContext().getPackageManager(), pkgName);
+            if (result == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
+                break;
+            }
+        }
+
+        return result;
     }
 
     @Override
@@ -2295,12 +2349,12 @@
 
     @Override
     public boolean canChangeDtmfToneLength() {
-        return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_DTMF_TYPE_ENABLED);
+        return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.KEY_DTMF_TYPE_ENABLED_BOOL);
     }
 
     @Override
     public boolean isWorldPhone() {
-        return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.BOOL_WORLD_PHONE);
+        return mApp.getCarrierConfig().getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL);
     }
 
     @Override
@@ -2382,9 +2436,14 @@
     @Override
     public void factoryReset(int subId) {
         enforceConnectivityInternalPermission();
+        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_NETWORK_RESET)) {
+            return;
+        }
+
         final long identity = Binder.clearCallingIdentity();
         try {
-            if (SubscriptionManager.isUsableSubIdValue(subId)) {
+            if (SubscriptionManager.isUsableSubIdValue(subId) && !mUserManager.hasUserRestriction(
+                    UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
                 // Enable data
                 setDataEnabled(subId, true);
                 // Set network selection mode to automatic
@@ -2398,4 +2457,83 @@
             Binder.restoreCallingIdentity(identity);
         }
     }
+
+    @Override
+    public String getLocaleFromDefaultSim() {
+        // We query all subscriptions instead of just the active ones, because
+        // this might be called early on in the provisioning flow when the
+        // subscriptions potentially aren't active yet.
+        final List<SubscriptionInfo> slist = getAllSubscriptionInfoList();
+        if (slist == null || slist.isEmpty()) {
+            return null;
+        }
+
+        // This function may be called very early, say, from the setup wizard, at
+        // which point we won't have a default subscription set. If that's the case
+        // we just choose the first, which will be valid in "most cases".
+        final int defaultSubId = getDefaultSubscription();
+        SubscriptionInfo info = null;
+        if (defaultSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            info = slist.get(0);
+        } else {
+            for (SubscriptionInfo item : slist) {
+                if (item.getSubscriptionId() == defaultSubId) {
+                    info = item;
+                    break;
+                }
+            }
+
+            if (info == null) {
+                return null;
+            }
+        }
+
+        // Try and fetch the locale from the carrier properties or from the SIM language
+        // preferences (EF-PL and EF-LI)...
+        final Phone defaultPhone = getPhone(info.getSubscriptionId());
+        if (defaultPhone != null) {
+            final Locale localeFromDefaultSim = defaultPhone.getLocaleFromSimAndCarrierPrefs();
+            if (localeFromDefaultSim != null) {
+                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();
+        }
+
+        return null;
+    }
+
+    private List<SubscriptionInfo> getAllSubscriptionInfoList() {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return mSubscriptionController.getAllSubInfoList(
+                    mPhone.getContext().getOpPackageName());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    private List<SubscriptionInfo> getActiveSubscriptionInfoList() {
+        final long identity = Binder.clearCallingIdentity();
+        try {
+            return mSubscriptionController.getActiveSubscriptionInfoList(
+                    mPhone.getContext().getOpPackageName());
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+    }
+
+    /**
+     * {@hide}
+     * Returns the modem stats
+     */
+    @Override
+    public ModemActivityInfo getModemActivityInfo() {
+        return (ModemActivityInfo) sendRequest(CMD_GET_MODEM_ACTIVITY_INFO, null);
+    }
 }
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index b9135c8..a619701 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -36,7 +36,6 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.VideoProfile;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -62,7 +61,6 @@
 import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.internal.telephony.sip.SipPhone;
-import com.android.internal.telephony.uicc.UiccCard;
 import com.android.phone.CallGatewayManager.RawGatewayInfo;
 import com.android.services.telephony.TelephonyConnectionService;
 
@@ -613,7 +611,7 @@
         final boolean initiallyIdle = app.mCM.getState() == PhoneConstants.State.IDLE;
 
         try {
-            connection = app.mCM.dial(phone, numberToDial, VideoProfile.VideoState.AUDIO_ONLY);
+            connection = app.mCM.dial(phone, numberToDial, VideoProfile.STATE_AUDIO_ONLY);
         } catch (CallStateException ex) {
             // CallStateException means a new outgoing call is not currently
             // possible: either no more call slots exist, or there's another
diff --git a/src/com/android/phone/common/mail/MailTransport.java b/src/com/android/phone/common/mail/MailTransport.java
index c66130c..99f0272 100644
--- a/src/com/android/phone/common/mail/MailTransport.java
+++ b/src/com/android/phone/common/mail/MailTransport.java
@@ -16,6 +16,7 @@
 package com.android.phone.common.mail;
 
 import android.content.Context;
+import android.net.Network;
 
 import com.android.phone.common.mail.store.ImapStore;
 import com.android.phone.common.mail.utils.LogUtils;
@@ -51,6 +52,7 @@
             HttpsURLConnection.getDefaultHostnameVerifier();
 
     private Context mContext;
+    private Network mNetwork;
     private String mHost;
     private int mPort;
     private Socket mSocket;
@@ -58,8 +60,9 @@
     private BufferedOutputStream mOut;
     private int mFlags;
 
-    public MailTransport(Context context, String address, int port, int flags) {
+    public MailTransport(Context context, Network network, String address, int port, int flags) {
         mContext = context;
+        mNetwork = network;
         mHost = address;
         mPort = port;
         mFlags = flags;
@@ -71,7 +74,7 @@
      */
     @Override
     public MailTransport clone() {
-        return new MailTransport(mContext, mHost, mPort, mFlags);
+        return new MailTransport(mContext, mNetwork, mHost, mPort, mFlags);
     }
 
     public boolean canTrySslSecurity() {
@@ -94,7 +97,11 @@
             if (canTrySslSecurity()) {
                 mSocket = HttpsURLConnection.getDefaultSSLSocketFactory().createSocket();
             } else {
-                mSocket = new Socket();
+                if (mNetwork == null) {
+                    mSocket = new Socket();
+                } else {
+                    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
diff --git a/src/com/android/phone/common/mail/store/ImapStore.java b/src/com/android/phone/common/mail/store/ImapStore.java
index 1c91e76..605abbb 100644
--- a/src/com/android/phone/common/mail/store/ImapStore.java
+++ b/src/com/android/phone/common/mail/store/ImapStore.java
@@ -17,6 +17,7 @@
 package com.android.phone.common.mail.store;
 
 import android.content.Context;
+import android.net.Network;
 
 import com.android.phone.common.mail.internet.MimeMessage;
 import com.android.phone.common.mail.MailTransport;
@@ -50,11 +51,11 @@
      * Contains all the information necessary to log into an imap server
      */
     public ImapStore(Context context, String username, String password, int port,
-            String serverName, int flags) {
+            String serverName, int flags, Network network) {
         mContext = context;
         mUsername = username;
         mPassword = password;
-        mTransport = new MailTransport(context, serverName, port, flags);
+        mTransport = new MailTransport(context, network, serverName, port, flags);
     }
 
     public Context getContext() {
diff --git a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
index ce738b6..86036ce 100644
--- a/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
+++ b/src/com/android/phone/settings/PhoneAccountSettingsFragment.java
@@ -25,6 +25,8 @@
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import com.android.internal.telephony.Phone;
+import com.android.phone.PhoneUtils;
 import com.android.phone.R;
 import com.android.phone.SubscriptionInfoHelper;
 import com.android.services.telephony.sip.SipAccountRegistry;
@@ -103,22 +105,56 @@
 
         addPreferencesFromResource(R.xml.phone_account_settings);
 
+        /**
+         * Here we make decisions about what we will and will not display with regards to phone-
+         * account settings.  The basic settings structure is this:
+         * (1) <Make Calls With...>  // Lets user pick a default account for outgoing calls
+         * (2) <Account List>
+         *       <Account>
+         *       ...
+         *       <Account>
+         *     </Account List>
+         * (3) <All Accounts>  // Lets user enable/disable third-party accounts. SIM-based accounts
+         *                     // are always enabled and so aren't relevant here.
+         *
+         * Here are the rules that we follow:
+         * - (1) is only shown if there are multiple enabled accounts, including SIM accounts.
+         *   This can be 2+ SIM accounts, 2+ third party accounts or any combination.
+         * - (2) The account list only lists (a) enabled third party accounts and (b) SIM-based
+         *   accounts. However, for single-SIM devices, if the only account to show is the
+         *   SIM-based account, we don't show the list at all under the assumption that the user
+         *   already knows about the account.
+         * - (3) Is only shown if there exist any third party accounts.  If none exist, then the
+         *   option is hidden since there is nothing that can be done in it.
+         *
+         * By far, the most common case for users will be the single-SIM device without any
+         * third party accounts. IOW, the great majority of users won't see any of these options.
+         */
         mAccountList = (PreferenceCategory) getPreferenceScreen().findPreference(
                 ACCOUNTS_LIST_CATEGORY_KEY);
-        if (shouldShowConnectionServiceList()) {
-            initAccountList();
+        List<PhoneAccountHandle> allNonSimAccounts =
+                getCallingAccounts(false /* includeSims */, true /* includeDisabled */);
+        // Check to see if we should show the entire section at all.
+        if (shouldShowConnectionServiceList(allNonSimAccounts)) {
+            List<PhoneAccountHandle> enabledAccounts =
+                    getCallingAccounts(true /* includeSims */, false /* includeDisabled */);
+            // Initialize the account list with the set of enabled & SIM accounts.
+            initAccountList(enabledAccounts);
 
             mDefaultOutgoingAccount = (AccountSelectionPreference)
                     getPreferenceScreen().findPreference(DEFAULT_OUTGOING_ACCOUNT_KEY);
             mDefaultOutgoingAccount.setListener(this);
-            if (mTelecomManager.getCallCapablePhoneAccounts().size() > 1) {
+
+            // Only show the 'Make Calls With..." option if there are multiple accounts.
+            if (enabledAccounts.size() > 1) {
                 updateDefaultOutgoingAccountsModel();
             } else {
                 mAccountList.removePreference(mDefaultOutgoingAccount);
             }
 
             Preference allAccounts = getPreferenceScreen().findPreference(ALL_CALLING_ACCOUNTS_KEY);
-            if (getNonSimCallingAccounts(true).isEmpty() && allAccounts != null) {
+            // If there are no third party (nonSim) accounts, then don't show enable/disable dialog.
+            if (allNonSimAccounts.isEmpty() && allAccounts != null) {
                 mAccountList.removePreference(allAccounts);
             }
         } else {
@@ -296,7 +332,7 @@
     private void updateDefaultOutgoingAccountsModel() {
         mDefaultOutgoingAccount.setModel(
                 mTelecomManager,
-                mTelecomManager.getCallCapablePhoneAccounts(),
+                getCallingAccounts(true /* includeSims */, false /* includeDisabled */),
                 mTelecomManager.getUserSelectedOutgoingPhoneAccount(),
                 getString(R.string.phone_accounts_ask_every_time));
     }
@@ -329,20 +365,22 @@
         }
     }
 
-    private void initAccountList() {
+    private void initAccountList(List<PhoneAccountHandle> enabledAccounts) {
+
         boolean isMultiSimDevice = mTelephonyManager.isMultiSimEnabled();
 
         // On a single-SIM device, do not list any accounts if the only account is the SIM-based
         // one. This is because on single-SIM devices, we do not expose SIM settings through the
         // account listing entry so showing it does nothing to help the user. Nor does the lack of
         // action match the "Settings" header above the listing.
-        if (!isMultiSimDevice && getNonSimCallingAccounts(false).isEmpty()) {
+        if (!isMultiSimDevice && getCallingAccounts(
+                false /* includeSims */, false /* includeDisabled */).isEmpty()){
             return;
         }
 
         // Obtain the list of phone accounts.
         List<PhoneAccount> accounts = new ArrayList<>();
-        for (PhoneAccountHandle handle : mTelecomManager.getCallCapablePhoneAccounts()) {
+        for (PhoneAccountHandle handle : enabledAccounts) {
             PhoneAccount account = mTelecomManager.getPhoneAccount(handle);
             if (account != null) {
                 accounts.add(account);
@@ -453,21 +491,29 @@
         return null;
     }
 
-    private boolean shouldShowConnectionServiceList() {
-        return mTelephonyManager.isMultiSimEnabled() ||
-            getNonSimCallingAccounts(true).size() > 0;
+    private boolean shouldShowConnectionServiceList(List<PhoneAccountHandle> allNonSimAccounts) {
+        return mTelephonyManager.isMultiSimEnabled() || allNonSimAccounts.size() > 0;
     }
 
-    private List<PhoneAccountHandle> getNonSimCallingAccounts(boolean includeDisabledAccounts) {
+    private List<PhoneAccountHandle> getCallingAccounts(
+            boolean includeSims, boolean includeDisabledAccounts) {
+        PhoneAccountHandle emergencyAccountHandle = getEmergencyPhoneAccount();
+
         List<PhoneAccountHandle> accountHandles =
                 mTelecomManager.getCallCapablePhoneAccounts(includeDisabledAccounts);
         for (Iterator<PhoneAccountHandle> i = accountHandles.iterator(); i.hasNext();) {
             PhoneAccountHandle handle = i.next();
+            if (handle.equals(emergencyAccountHandle)) {
+                // never include emergency call accounts in this piece of code.
+                i.remove();
+                continue;
+            }
+
             PhoneAccount account = mTelecomManager.getPhoneAccount(handle);
-            if (account == null ||
-                    (account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION))) {
-                // If the account is no longer valid OR the account is a built-in SIM account,
-                // remove!
+            if (account == null) {
+                i.remove();
+            } else if (!includeSims &&
+                    account.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
                 i.remove();
             }
         }
@@ -477,4 +523,9 @@
     private String nullToEmpty(String str) {
         return str == null ? "" : str;
     }
+
+    private PhoneAccountHandle getEmergencyPhoneAccount() {
+        return PhoneUtils.makePstnPhoneAccountHandleWithPrefix(
+                (Phone) null, "" /* prefix */, true /* isEmergency */);
+    }
 }
diff --git a/src/com/android/phone/settings/VisualVoicemailSettingsUtil.java b/src/com/android/phone/settings/VisualVoicemailSettingsUtil.java
new file mode 100644
index 0000000..5dd3166
--- /dev/null
+++ b/src/com/android/phone/settings/VisualVoicemailSettingsUtil.java
@@ -0,0 +1,98 @@
+/*
+ * 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.settings;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.telecom.PhoneAccountHandle;
+
+import com.android.internal.telephony.Phone;
+import com.android.phone.PhoneUtils;
+import com.android.phone.vvm.omtp.OmtpConstants;
+import com.android.phone.vvm.omtp.sms.StatusMessage;
+
+/**
+ * Save visual voicemail login values in shared preferences to be retrieved later.
+ * Because a voicemail source is tied 1:1 to a phone account, the phone account handle is used in
+ * the key for each voicemail source and the associated data.
+ */
+public class VisualVoicemailSettingsUtil {
+    private static final String VISUAL_VOICEMAIL_SHARED_PREFS_KEY_PREFIX =
+            "visual_voicemail_";
+
+    private static final String IS_ENABLED_KEY = "is_enabled";
+
+    public static void setVisualVoicemailEnabled(Phone phone, boolean isEnabled) {
+        setVisualVoicemailEnabled(phone.getContext(), PhoneUtils.makePstnPhoneAccountHandle(phone),
+                isEnabled);
+    }
+
+    public static void setVisualVoicemailEnabled(Context context, PhoneAccountHandle phoneAccount,
+            boolean isEnabled) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean(
+                getVisualVoicemailSharedPrefsKey(IS_ENABLED_KEY, phoneAccount), isEnabled);
+        editor.commit();
+    }
+
+    public static boolean isVisualVoicemailEnabled(Context context,
+            PhoneAccountHandle phoneAccount) {
+        if (phoneAccount == null) {
+            return false;
+        }
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        return prefs.getBoolean(getVisualVoicemailSharedPrefsKey(IS_ENABLED_KEY, phoneAccount),
+                false);
+    }
+
+    public static boolean isVisualVoicemailEnabled(Phone phone) {
+        return isVisualVoicemailEnabled(phone.getContext(),
+                PhoneUtils.makePstnPhoneAccountHandle(phone));
+    }
+
+    public static void setVisualVoicemailCredentialsFromStatusMessage(Context context,
+            PhoneAccountHandle phoneAccount, StatusMessage message) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = prefs.edit();
+
+        editor.putString(
+                getVisualVoicemailSharedPrefsKey(OmtpConstants.IMAP_PORT, phoneAccount),
+                message.getImapPort());
+        editor.putString(
+                getVisualVoicemailSharedPrefsKey(OmtpConstants.SERVER_ADDRESS, phoneAccount),
+                message.getServerAddress());
+        editor.putString(
+                getVisualVoicemailSharedPrefsKey(OmtpConstants.IMAP_USER_NAME, phoneAccount),
+                message.getImapUserName());
+        editor.putString(
+                getVisualVoicemailSharedPrefsKey(OmtpConstants.IMAP_PASSWORD, phoneAccount),
+                message.getImapPassword());
+        editor.commit();
+    }
+
+    public static String getVisualVoicemailCredentials(Context context, String key,
+            PhoneAccountHandle phoneAccount) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        return prefs.getString(getVisualVoicemailSharedPrefsKey(key, phoneAccount), null);
+    }
+
+    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 f017836..f70ee65 100644
--- a/src/com/android/phone/settings/VoicemailSettingsActivity.java
+++ b/src/com/android/phone/settings/VoicemailSettingsActivity.java
@@ -28,7 +28,9 @@
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.ContactsContract.CommonDataKinds;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
@@ -40,7 +42,10 @@
 import com.android.phone.R;
 import com.android.phone.EditPhoneNumberPreference;
 import com.android.phone.PhoneGlobals;
+import com.android.phone.PhoneUtils;
 import com.android.phone.SubscriptionInfoHelper;
+import com.android.phone.vvm.omtp.OmtpVvmCarrierConfigHelper;
+import com.android.phone.vvm.omtp.sync.OmtpVvmSourceManager;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -187,12 +192,14 @@
     private boolean mForeground;
     private Phone mPhone;
     private SubscriptionInfoHelper mSubscriptionInfoHelper;
+    private OmtpVvmCarrierConfigHelper mOmtpVvmCarrierConfigHelper;
 
     private EditPhoneNumberPreference mSubMenuVoicemailSettings;
     private VoicemailProviderListPreference mVoicemailProviders;
     private PreferenceScreen mVoicemailSettings;
     private VoicemailRingtonePreference mVoicemailNotificationRingtone;
     private CheckBoxPreference mVoicemailNotificationVibrate;
+    private SwitchPreference mVoicemailVisualVoicemail;
 
 
     //*********************************************************************************************
@@ -212,6 +219,8 @@
         mSubscriptionInfoHelper.setActionBarTitle(
                 getActionBar(), getResources(), R.string.voicemail_settings_with_label);
         mPhone = mSubscriptionInfoHelper.getPhone();
+        mOmtpVvmCarrierConfigHelper = new OmtpVvmCarrierConfigHelper(
+                mPhone.getContext(), mPhone.getSubId());
     }
 
     @Override
@@ -248,6 +257,17 @@
                 getResources().getString(R.string.voicemail_notification_vibrate_key));
         mVoicemailNotificationVibrate.setOnPreferenceChangeListener(this);
 
+        mVoicemailVisualVoicemail = (SwitchPreference) findPreference(
+                getResources().getString(R.string.voicemail_visual_voicemail_key));
+        if (TelephonyManager.VVM_TYPE_OMTP.equals(mOmtpVvmCarrierConfigHelper.getVvmType()) ||
+                TelephonyManager.VVM_TYPE_CVVM.equals(mOmtpVvmCarrierConfigHelper.getVvmType())) {
+            mVoicemailVisualVoicemail.setOnPreferenceChangeListener(this);
+            mVoicemailVisualVoicemail.setChecked(
+                    VisualVoicemailSettingsUtil.isVisualVoicemailEnabled(mPhone));
+        } else {
+            prefSet.removePreference(mVoicemailVisualVoicemail);
+        }
+
         updateVMPreferenceWidgets(mVoicemailProviders.getValue());
 
         // check the intent that started this activity and pop up the voicemail
@@ -366,6 +386,14 @@
             // TODO: Revert to checking reference after migrating voicemail to its own activity.
             VoicemailNotificationSettingsUtil.setVibrationEnabled(
                     mPhone, Boolean.TRUE.equals(objValue));
+        } else if (preference.getKey().equals(mVoicemailVisualVoicemail.getKey())) {
+            if ((Boolean) objValue) {
+                VisualVoicemailSettingsUtil.setVisualVoicemailEnabled(mPhone, true);
+                mOmtpVvmCarrierConfigHelper.startActivation();
+            } else {
+                OmtpVvmSourceManager.getInstance(mPhone.getContext()).removeSource(mPhone);
+                mOmtpVvmCarrierConfigHelper.startDeactivation();
+            }
         }
 
         // Always let the preference setting proceed.
diff --git a/src/com/android/phone/settings/fdn/FdnSetting.java b/src/com/android/phone/settings/fdn/FdnSetting.java
index b825f7a..134d8e6 100644
--- a/src/com/android/phone/settings/fdn/FdnSetting.java
+++ b/src/com/android/phone/settings/fdn/FdnSetting.java
@@ -247,25 +247,29 @@
                 // a toast, or just update the UI.
                 case EVENT_PIN2_ENTRY_COMPLETE: {
                         AsyncResult ar = (AsyncResult) msg.obj;
-                        if (ar.exception != null && ar.exception instanceof CommandException) {
-                            int attemptsRemaining = msg.arg1;
-                            // see if PUK2 is requested and alert the user accordingly.
-                            CommandException.Error e =
-                                    ((CommandException) ar.exception).getCommandError();
-                            switch (e) {
-                                case SIM_PUK2:
-                                    // make sure we set the PUK2 state so that we can skip
-                                    // some redundant behaviour.
-                                    displayMessage(R.string.fdn_enable_puk2_requested,
-                                            attemptsRemaining);
-                                    resetPinChangeStateForPUK2();
-                                    break;
-                                case PASSWORD_INCORRECT:
-                                    displayMessage(R.string.pin2_invalid, attemptsRemaining);
-                                    break;
-                                default:
-                                    displayMessage(R.string.fdn_failed, attemptsRemaining);
-                                    break;
+                        if (ar.exception != null) {
+                            if (ar.exception instanceof CommandException) {
+                                int attemptsRemaining = msg.arg1;
+                                // see if PUK2 is requested and alert the user accordingly.
+                                CommandException.Error e =
+                                        ((CommandException) ar.exception).getCommandError();
+                                switch (e) {
+                                    case SIM_PUK2:
+                                        // make sure we set the PUK2 state so that we can skip
+                                        // some redundant behaviour.
+                                        displayMessage(R.string.fdn_enable_puk2_requested,
+                                                attemptsRemaining);
+                                        resetPinChangeStateForPUK2();
+                                        break;
+                                    case PASSWORD_INCORRECT:
+                                        displayMessage(R.string.pin2_invalid, attemptsRemaining);
+                                        break;
+                                    default:
+                                        displayMessage(R.string.fdn_failed, attemptsRemaining);
+                                        break;
+                                }
+                            } else {
+                                displayMessage(R.string.pin2_error_exception);
                             }
                         }
                         updateEnableFDN();
@@ -280,32 +284,36 @@
                             log("Handle EVENT_PIN2_CHANGE_COMPLETE");
                         AsyncResult ar = (AsyncResult) msg.obj;
                         if (ar.exception != null) {
-                            int attemptsRemaining = msg.arg1;
-                            log("Handle EVENT_PIN2_CHANGE_COMPLETE attemptsRemaining="
-                                    + attemptsRemaining);
-                            CommandException ce = (CommandException) ar.exception;
-                            if (ce.getCommandError() == CommandException.Error.SIM_PUK2) {
-                                // throw an alert dialog on the screen, displaying the
-                                // request for a PUK2.  set the cancel listener to
-                                // FdnSetting.onCancel().
-                                AlertDialog a = new AlertDialog.Builder(FdnSetting.this)
-                                    .setMessage(R.string.puk2_requested)
-                                    .setCancelable(true)
-                                    .setOnCancelListener(FdnSetting.this)
-                                    .create();
-                                a.getWindow().addFlags(
-                                        WindowManager.LayoutParams.FLAG_DIM_BEHIND);
-                                a.show();
-                            } else {
-                                // set the correct error message depending upon the state.
-                                // Reset the state depending upon or knowledge of the PUK state.
-                                if (!mIsPuk2Locked) {
-                                    displayMessage(R.string.badPin2, attemptsRemaining);
-                                    resetPinChangeState();
+                            if (ar.exception instanceof CommandException) {
+                                int attemptsRemaining = msg.arg1;
+                                log("Handle EVENT_PIN2_CHANGE_COMPLETE attemptsRemaining="
+                                        + attemptsRemaining);
+                                CommandException ce = (CommandException) ar.exception;
+                                if (ce.getCommandError() == CommandException.Error.SIM_PUK2) {
+                                    // throw an alert dialog on the screen, displaying the
+                                    // request for a PUK2.  set the cancel listener to
+                                    // FdnSetting.onCancel().
+                                    AlertDialog a = new AlertDialog.Builder(FdnSetting.this)
+                                        .setMessage(R.string.puk2_requested)
+                                        .setCancelable(true)
+                                        .setOnCancelListener(FdnSetting.this)
+                                        .create();
+                                    a.getWindow().addFlags(
+                                            WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+                                    a.show();
                                 } else {
-                                    displayMessage(R.string.badPuk2, attemptsRemaining);
-                                    resetPinChangeStateForPUK2();
+                                    // set the correct error message depending upon the state.
+                                    // Reset the state depending upon or knowledge of the PUK state.
+                                    if (!mIsPuk2Locked) {
+                                        displayMessage(R.string.badPin2, attemptsRemaining);
+                                        resetPinChangeState();
+                                    } else {
+                                        displayMessage(R.string.badPuk2, attemptsRemaining);
+                                        resetPinChangeStateForPUK2();
+                                    }
                                 }
+                            } else {
+                                displayMessage(R.string.pin2_error_exception);
                             }
                         } else {
                             if (mPinChangeState == PIN_CHANGE_PUK) {
diff --git a/src/com/android/phone/vvm/omtp/OmtpConstants.java b/src/com/android/phone/vvm/omtp/OmtpConstants.java
index 971d2d6..fa3cb63 100644
--- a/src/com/android/phone/vvm/omtp/OmtpConstants.java
+++ b/src/com/android/phone/vvm/omtp/OmtpConstants.java
@@ -188,4 +188,6 @@
         put(RETURN_CODE, RETURN_CODE_VALUES);
     }};
 
+    /** Indicates the client is Google visual voicemail version 1.0. */
+    public static final String CLIENT_TYPE_GOOGLE_10 = "google.vvm.10";
 }
diff --git a/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
new file mode 100644
index 0000000..9f39db1
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
@@ -0,0 +1,155 @@
+/*
+ * 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;
+
+import android.content.Context;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SmsManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.phone.vvm.omtp.sms.OmtpCvvmMessageSender;
+import com.android.phone.vvm.omtp.sms.OmtpMessageSender;
+import com.android.phone.vvm.omtp.sms.OmtpStandardMessageSender;
+
+/**
+ * Handle activation and deactivation of a visual voicemail source. This class is necessary to
+ * retrieve carrier vvm configuration details before sending the appropriate texts.
+ */
+public class OmtpVvmCarrierConfigHelper {
+    private static final String TAG = "OmtpVvmCarrierConfigHelper";
+    private Context mContext;
+    private int mSubId;
+    private PersistableBundle mCarrierConfig;
+    private String mVvmType;
+
+    public OmtpVvmCarrierConfigHelper(Context context, int subId) {
+        mContext = context;
+        mSubId = subId;
+        mCarrierConfig = getCarrierConfig();
+        mVvmType = getVvmType();
+    }
+
+    public String getVvmType() {
+        if (mCarrierConfig == null) {
+            return null;
+        }
+
+        return mCarrierConfig.getString(
+                CarrierConfigManager.KEY_VVM_TYPE_STRING, null);
+    }
+
+    public String getCarrierVvmPackageName() {
+        if (mCarrierConfig == null) {
+            return null;
+        }
+
+        return mCarrierConfig.getString(
+                CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING, null);
+    }
+
+    public boolean isOmtpVvmType() {
+        return (TelephonyManager.VVM_TYPE_OMTP.equals(mVvmType) ||
+                TelephonyManager.VVM_TYPE_CVVM.equals(mVvmType));
+    }
+
+    /**
+     * For checking upon sim insertion whether visual voicemail should be enabled. This method does
+     * so by checking if the carrier's voicemail app is installed.
+     */
+    public boolean isEnabledByDefault() {
+        String packageName = mCarrierConfig.getString(
+                CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING);
+        if (packageName == null) {
+            return true;
+        }
+        try {
+            mContext.getPackageManager().getPackageInfo(packageName, 0);
+            return false;
+        } catch (NameNotFoundException e) {
+            return true;
+        }
+    }
+
+    public void startActivation() {
+        OmtpMessageSender messageSender = getMessageSender();
+        if (messageSender != null) {
+            Log.i(TAG, "Requesting VVM activation for subId: " + mSubId);
+            messageSender.requestVvmActivation(null);
+        }
+    }
+
+    public void startDeactivation() {
+        OmtpMessageSender messageSender = getMessageSender();
+        if (messageSender != null) {
+            Log.i(TAG, "Requesting VVM deactivation for subId: " + mSubId);
+            messageSender.requestVvmDeactivation(null);
+        }
+    }
+
+    private PersistableBundle getCarrierConfig() {
+        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
+            Log.w(TAG, "Invalid subscriptionId or subscriptionId not provided in intent.");
+            return null;
+        }
+
+        CarrierConfigManager carrierConfigManager = (CarrierConfigManager)
+                mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        if (carrierConfigManager == null) {
+            Log.w(TAG, "No carrier config service found.");
+            return null;
+        }
+
+        return carrierConfigManager.getConfigForSubId(mSubId);
+    }
+
+    private OmtpMessageSender getMessageSender() {
+        if (mCarrierConfig == null) {
+            Log.w(TAG, "Empty carrier config.");
+            return null;
+        }
+
+        int applicationPort = mCarrierConfig.getInt(
+                CarrierConfigManager.KEY_VVM_PORT_NUMBER_INT, 0);
+        String destinationNumber = mCarrierConfig.getString(
+                CarrierConfigManager.KEY_VVM_DESTINATION_NUMBER_STRING);
+        if (TextUtils.isEmpty(destinationNumber)) {
+            Log.w(TAG, "No destination number for this carrier.");
+            return null;
+        }
+
+        OmtpMessageSender messageSender = null;
+        SmsManager smsManager = SmsManager.getSmsManagerForSubscriptionId(mSubId);
+        switch (mVvmType) {
+            case TelephonyManager.VVM_TYPE_OMTP:
+                messageSender = new OmtpStandardMessageSender(smsManager, (short) applicationPort,
+                        destinationNumber, null, OmtpConstants.PROTOCOL_VERSION1_1, null);
+                break;
+            case TelephonyManager.VVM_TYPE_CVVM:
+                messageSender = new OmtpCvvmMessageSender(smsManager, (short) applicationPort,
+                        destinationNumber);
+                break;
+            default:
+                Log.w(TAG, "Unexpected visual voicemail type: " + mVvmType);
+        }
+
+        return messageSender;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
index 917374c..3ac1096 100644
--- a/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
+++ b/src/com/android/phone/vvm/omtp/SimChangeReceiver.java
@@ -18,18 +18,18 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.PersistableBundle;
+import android.telecom.PhoneAccountHandle;
 import android.telephony.CarrierConfigManager;
-import android.telephony.SmsManager;
 import android.telephony.SubscriptionManager;
-import android.text.TextUtils;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import com.android.internal.telephony.IccCardConstants;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.TelephonyIntents;
-import com.android.phone.vvm.omtp.sms.OmtpMessageSender;
-import com.android.phone.vvm.omtp.sync.OmtpVvmSyncAccountManager;
+import com.android.phone.PhoneUtils;
+import com.android.phone.settings.VisualVoicemailSettingsUtil;
+import com.android.phone.vvm.omtp.sync.OmtpVvmSourceManager;
 
 /**
  * This class listens to the {@link CarrierConfigManager#ACTION_CARRIER_CONFIG_CHANGED} and
@@ -41,6 +41,7 @@
  */
 public class SimChangeReceiver extends BroadcastReceiver {
     private final String TAG = "SimChangeReceiver";
+
     @Override
     public void onReceive(Context context, Intent intent) {
         final String action = intent.getAction();
@@ -54,57 +55,31 @@
                 if (IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(
                         intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE))) {
                     Log.i(TAG, "Sim removed, removing inactive accounts");
-                    OmtpVvmSyncAccountManager.getInstance(context).removeInactiveAccounts();
+                    OmtpVvmSourceManager.getInstance(context).removeInactiveSources();
                 }
                 break;
             case CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED:
-                handleCarrierConfigChange(context, intent);
+                int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
+                        SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                OmtpVvmCarrierConfigHelper carrierConfigHelper =
+                        new OmtpVvmCarrierConfigHelper(context, subId);
+
+                if (carrierConfigHelper.isOmtpVvmType()) {
+                    PhoneAccountHandle phoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
+                            SubscriptionManager.getPhoneId(subId));
+
+                    if (carrierConfigHelper.isEnabledByDefault()) {
+                        VisualVoicemailSettingsUtil.setVisualVoicemailEnabled(
+                                context, phoneAccount, true);
+                        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.
+                        OmtpVvmSourceManager.getInstance(context).removeSource(phoneAccount);
+                        carrierConfigHelper.startDeactivation();
+                    }
+                }
                 break;
         }
     }
-
-    private void handleCarrierConfigChange(Context context, Intent intent) {
-        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
-            Log.w(TAG, "Invalid subscriptionId or subscriptionId not provided in intent.");
-            return;
-        }
-
-        CarrierConfigManager carrierConfigManager = (CarrierConfigManager)
-                context.getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        if (carrierConfigManager == null) {
-            Log.w(TAG, "No carrier config service found.");
-            return;
-        }
-
-        PersistableBundle carrierConfig = carrierConfigManager.getConfigForSubId(subId);
-        if (carrierConfig == null) {
-            Log.w(TAG, "Empty carrier config.");
-            return;
-        }
-        String vvmType = carrierConfig.getString(
-                CarrierConfigManager.STRING_VVM_TYPE, null);
-
-        if (!CarrierConfigManager.VVM_TYPE_OMTP.equals(vvmType)) {
-            // This is not an OMTP visual voicemail compatible carrier.
-            return;
-        }
-
-        int applicationPort = carrierConfig.getInt(
-                CarrierConfigManager.INT_VVM_PORT_NUMBER, 0);
-        String destinationNumber = carrierConfig.getString(
-                CarrierConfigManager.STRING_VVM_DESTINATION_NUMBER);
-        if (TextUtils.isEmpty(destinationNumber)) {
-            Log.w(TAG, "No destination number for this carrier.");
-            return;
-        }
-
-        Log.i(TAG, "Requesting VVM activation for subId: " + subId);
-        SmsManager smsManager = SmsManager.getSmsManagerForSubscriptionId(subId);
-        OmtpMessageSender messageSender = new OmtpMessageSender(smsManager,
-                (short) applicationPort, destinationNumber, null,
-                OmtpConstants.PROTOCOL_VERSION1_1, null);
-        messageSender.requestVvmActivation(null);
-    }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/VvmPackageInstallReceiver.java b/src/com/android/phone/vvm/omtp/VvmPackageInstallReceiver.java
new file mode 100644
index 0000000..1541f2d
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/VvmPackageInstallReceiver.java
@@ -0,0 +1,55 @@
+/*
+ * 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;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telecom.PhoneAccountHandle;
+
+import com.android.phone.PhoneUtils;
+import com.android.phone.vvm.omtp.sync.OmtpVvmSourceManager;
+
+import java.util.Set;
+
+/**
+ * When a new package is installed, check if it matches any of the vvm carrier apps of the currently
+ * enabled dialer vvm sources.
+ */
+public class VvmPackageInstallReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (intent.getData() == null) {
+            return;
+        }
+
+        String packageName = intent.getData().getSchemeSpecificPart();
+        if (packageName == null) {
+            return;
+        }
+
+        OmtpVvmSourceManager vvmSourceManager = OmtpVvmSourceManager.getInstance(context);
+        Set<PhoneAccountHandle> phoneAccounts = vvmSourceManager.getOmtpVvmSources();
+        for (PhoneAccountHandle phoneAccount : phoneAccounts) {
+            OmtpVvmCarrierConfigHelper carrierConfigHelper = new OmtpVvmCarrierConfigHelper(
+                    context, PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccount));
+            if (packageName.equals(carrierConfigHelper.getCarrierVvmPackageName())) {
+                OmtpVvmSourceManager.getInstance(context).removeSource(phoneAccount);
+                carrierConfigHelper.startDeactivation();
+            }
+        }
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/fetch/FetchVoicemailReceiver.java b/src/com/android/phone/vvm/omtp/fetch/FetchVoicemailReceiver.java
index ae32c27..de2ccf5 100644
--- a/src/com/android/phone/vvm/omtp/fetch/FetchVoicemailReceiver.java
+++ b/src/com/android/phone/vvm/omtp/fetch/FetchVoicemailReceiver.java
@@ -15,21 +15,26 @@
  */
 package com.android.phone.vvm.omtp.fetch;
 
-import android.accounts.Account;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
 import android.net.Uri;
 import android.provider.VoicemailContract;
 import android.provider.VoicemailContract.Voicemails;
+import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.phone.PhoneUtils;
 import com.android.phone.vvm.omtp.imap.ImapHelper;
-import com.android.phone.vvm.omtp.sync.OmtpVvmSyncAccountManager;
+import com.android.phone.vvm.omtp.sync.OmtpVvmSourceManager;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -45,12 +50,22 @@
     public static final int SOURCE_DATA = 0;
     public static final int PHONE_ACCOUNT_ID = 1;
 
+    // Timeout used to call ConnectivityManager.requestNetwork
+    private static final int NETWORK_REQUEST_TIMEOUT_MILLIS = 60 * 1000;
+
     private ContentResolver mContentResolver;
     private Uri mUri;
+    private NetworkRequest mNetworkRequest;
+    private OmtpVvmNetworkRequestCallback mNetworkCallback;
+    private Context mContext;
+    private String mUid;
+    private ConnectivityManager mConnectivityManager;
+    private PhoneAccountHandle mPhoneAccount;
 
     @Override
     public void onReceive(final Context context, Intent intent) {
         if (VoicemailContract.ACTION_FETCH_VOICEMAIL.equals(intent.getAction())) {
+            mContext = context;
             mContentResolver = context.getContentResolver();
             mUri = intent.getData();
 
@@ -71,7 +86,7 @@
             }
             try {
                 if (cursor.moveToFirst()) {
-                    final String uid = cursor.getString(SOURCE_DATA);
+                    mUid = cursor.getString(SOURCE_DATA);
                     String accountId = cursor.getString(PHONE_ACCOUNT_ID);
                     if (TextUtils.isEmpty(accountId)) {
                         TelephonyManager telephonyManager = (TelephonyManager)
@@ -83,27 +98,65 @@
                             return;
                         }
                     }
-                    final Account account = new Account(accountId,
-                            OmtpVvmSyncAccountManager.ACCOUNT_TYPE);
 
-                    if (!OmtpVvmSyncAccountManager.getInstance(context)
-                            .isAccountRegistered(account)) {
+                    mPhoneAccount = PhoneUtils.makePstnPhoneAccountHandle(accountId);
+                    if (!OmtpVvmSourceManager.getInstance(context)
+                            .isVvmSourceRegistered(mPhoneAccount)) {
                         Log.w(TAG, "Account not registered - cannot retrieve message.");
                         return;
                     }
 
-                    Executor executor = Executors.newCachedThreadPool();
-                    executor.execute(new Runnable() {
-                        @Override
-                        public void run() {
-                            new ImapHelper(context, account).fetchVoicemailPayload(
-                                    new VoicemailFetchedCallback(context, mUri), uid);
-                        }
-                    });
+                    int subId = PhoneUtils.getSubIdForPhoneAccountHandle(mPhoneAccount);
+
+                    mNetworkRequest = new NetworkRequest.Builder()
+                            .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);
                 }
             } finally {
                 cursor.close();
             }
         }
     }
+
+    private class OmtpVvmNetworkRequestCallback extends ConnectivityManager.NetworkCallback {
+        @Override
+        public void onAvailable(final Network network) {
+            Executor executor = Executors.newCachedThreadPool();
+            executor.execute(new Runnable() {
+                @Override
+                public void run() {
+                    new ImapHelper(mContext, mPhoneAccount, network).fetchVoicemailPayload(
+                            new VoicemailFetchedCallback(mContext, mUri), mUid);
+                    releaseNetwork();
+                }
+            });
+        }
+
+        @Override
+        public void onLost(Network network) {
+            releaseNetwork();
+        }
+
+        @Override
+        public void onUnavailable() {
+            releaseNetwork();
+        }
+    }
+
+    private void releaseNetwork() {
+        getConnectivityManager().unregisterNetworkCallback(mNetworkCallback);
+    }
+
+    private ConnectivityManager getConnectivityManager() {
+        if (mConnectivityManager == null) {
+            mConnectivityManager = (ConnectivityManager) mContext.getSystemService(
+                    Context.CONNECTIVITY_SERVICE);
+        }
+        return mConnectivityManager;
+    }
 }
diff --git a/src/com/android/phone/vvm/omtp/imap/ImapHelper.java b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
index 1368286..e23dd41 100644
--- a/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
+++ b/src/com/android/phone/vvm/omtp/imap/ImapHelper.java
@@ -15,15 +15,13 @@
  */
 package com.android.phone.vvm.omtp.imap;
 
-import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.content.Context;
+import android.net.Network;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.Voicemail;
 
 import android.util.Base64;
 
-import com.android.phone.PhoneUtils;
 import com.android.phone.common.mail.Address;
 import com.android.phone.common.mail.Body;
 import com.android.phone.common.mail.BodyPart;
@@ -38,6 +36,7 @@
 import com.android.phone.common.mail.store.ImapStore;
 import com.android.phone.common.mail.store.imap.ImapConstants;
 import com.android.phone.common.mail.utils.LogUtils;
+import com.android.phone.settings.VisualVoicemailSettingsUtil;
 import com.android.phone.vvm.omtp.OmtpConstants;
 import com.android.phone.vvm.omtp.fetch.VoicemailFetchedCallback;
 
@@ -61,21 +60,24 @@
     private Context mContext;
     private PhoneAccountHandle mPhoneAccount;
 
-    public ImapHelper(Context context, Account account) {
+    public ImapHelper(Context context, PhoneAccountHandle phoneAccount, Network network) {
         try {
             mContext = context;
-            mPhoneAccount = PhoneUtils.makePstnPhoneAccountHandle(account.name);
+            mPhoneAccount = phoneAccount;
             TempDirectory.setTempDirectory(context);
 
-            AccountManager accountManager = AccountManager.get(context);
-            String username = accountManager.getUserData(account, OmtpConstants.IMAP_USER_NAME);
-            String password = accountManager.getUserData(account, OmtpConstants.IMAP_PASSWORD);
-            String serverName = accountManager.getUserData(account, OmtpConstants.SERVER_ADDRESS);
+            String username = VisualVoicemailSettingsUtil.getVisualVoicemailCredentials(context,
+                    OmtpConstants.IMAP_USER_NAME, phoneAccount);
+            String password = VisualVoicemailSettingsUtil.getVisualVoicemailCredentials(context,
+                    OmtpConstants.IMAP_PASSWORD, phoneAccount);
+            String serverName = VisualVoicemailSettingsUtil.getVisualVoicemailCredentials(context,
+                    OmtpConstants.SERVER_ADDRESS, phoneAccount);
             int port = Integer.parseInt(
-                    accountManager.getUserData(account, OmtpConstants.IMAP_PORT));
+                    VisualVoicemailSettingsUtil.getVisualVoicemailCredentials(context,
+                            OmtpConstants.IMAP_PORT, phoneAccount));
             // TODO: determine the security protocol (e.g. ssl, tls, none, etc.)
             mImapStore = new ImapStore(
-                    context, username, password, port, serverName, ImapStore.FLAG_NONE);
+                    context, username, password, port, serverName, ImapStore.FLAG_NONE, network);
         } catch (NumberFormatException e) {
             LogUtils.e(TAG, e, "Could not parse port number");
         }
@@ -355,6 +357,9 @@
 
     private ImapFolder openImapFolder(String modeReadWrite) {
         try {
+            if (mImapStore == null) {
+                return null;
+            }
             ImapFolder folder = new ImapFolder(mImapStore, ImapConstants.INBOX);
             folder.open(modeReadWrite);
             return folder;
diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpCvvmMessageSender.java b/src/com/android/phone/vvm/omtp/sms/OmtpCvvmMessageSender.java
new file mode 100644
index 0000000..ef4e40b
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpCvvmMessageSender.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2015 Google Inc. All Rights Reserved.
+ *
+ * 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.sms;
+
+import android.annotation.Nullable;
+import android.app.PendingIntent;
+import android.telephony.SmsManager;
+
+import com.android.phone.vvm.omtp.OmtpConstants;
+
+/**
+ * An implementation of the OmtpMessageSender for T-Mobile.
+ */
+public class OmtpCvvmMessageSender extends OmtpMessageSender {
+    public OmtpCvvmMessageSender(SmsManager smsManager, short applicationPort,
+            String destinationNumber) {
+        super(smsManager, applicationPort, destinationNumber);
+    }
+
+    @Override
+    public void requestVvmActivation(@Nullable PendingIntent sentIntent) {
+        sendCvvmMessage(OmtpConstants.ACTIVATE_REQUEST, sentIntent);
+    }
+
+    @Override
+    public void requestVvmDeactivation(@Nullable PendingIntent sentIntent) {
+        sendCvvmMessage(OmtpConstants.DEACTIVATE_REQUEST, sentIntent);
+    }
+
+    @Override
+    public void requestVvmStatus(@Nullable PendingIntent sentIntent) {
+        sendCvvmMessage(OmtpConstants.STATUS_REQUEST, sentIntent);
+    }
+
+    private void sendCvvmMessage(String request, PendingIntent sentIntent) {
+        StringBuilder sb = new StringBuilder().append(request);
+        sb.append(OmtpConstants.SMS_PREFIX_SEPARATOR);
+        appendField(sb, "dt", "6");
+        sendSms(sb.toString(), sentIntent);
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java b/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
index 2d18ee7..867a14f 100644
--- a/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpMessageReceiver.java
@@ -15,12 +15,9 @@
  */
 package com.android.phone.vvm.omtp.sms;
 
-import android.accounts.Account;
 import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Bundle;
 import android.provider.Telephony;
 import android.provider.VoicemailContract;
 import android.telecom.PhoneAccountHandle;
@@ -30,9 +27,10 @@
 
 import com.android.internal.telephony.PhoneConstants;
 import com.android.phone.PhoneUtils;
+import com.android.phone.settings.VisualVoicemailSettingsUtil;
 import com.android.phone.vvm.omtp.OmtpConstants;
-import com.android.phone.vvm.omtp.sync.OmtpVvmSyncAccountManager;
-import com.android.phone.vvm.omtp.sync.OmtpVvmSyncService.OmtpVvmSyncAdapter;
+import com.android.phone.vvm.omtp.sync.OmtpVvmSourceManager;
+import com.android.phone.vvm.omtp.sync.OmtpVvmSyncService;
 import com.android.phone.vvm.omtp.sync.VoicemailsQueryHelper;
 
 /**
@@ -50,6 +48,11 @@
         mPhoneAccount = PhoneUtils.makePstnPhoneAccountHandle(
                 intent.getExtras().getInt(PhoneConstants.PHONE_KEY));
 
+        if (!VisualVoicemailSettingsUtil.isVisualVoicemailEnabled(mContext, mPhoneAccount)) {
+            Log.v(TAG, "Received vvm message for disabled vvm source.");
+            return;
+        }
+
         SmsMessage[] messages = Telephony.Sms.Intents.getMessagesFromIntent(intent);
         StringBuilder messageBody = new StringBuilder();
 
@@ -66,7 +69,7 @@
                 processSync(message);
             } else if (messageData.getPrefix() == OmtpConstants.STATUS_SMS_PREFIX) {
                 StatusMessage message = new StatusMessage(messageData);
-                updateAccount(message);
+                updateSource(message);
             } else {
                 Log.e(TAG, "This should never have happened");
             }
@@ -96,12 +99,10 @@
                 queryHelper.insertIfUnique(voicemail);
                 break;
             case OmtpConstants.MAILBOX_UPDATE:
-                // Needs a total resync
-                Bundle bundle = new Bundle();
-                bundle.putBoolean(OmtpVvmSyncAdapter.SYNC_EXTRAS_DOWNLOAD, true);
-                ContentResolver.requestSync(
-                        new Account(mPhoneAccount.getId(), OmtpVvmSyncAccountManager.ACCOUNT_TYPE),
-                        VoicemailContract.AUTHORITY, bundle);
+                Intent serviceIntent = new Intent(mContext, OmtpVvmSyncService.class);
+                serviceIntent.setAction(OmtpVvmSyncService.SYNC_DOWNLOAD_ONLY);
+                serviceIntent.putExtra(OmtpVvmSyncService.EXTRA_PHONE_ACCOUNT, mPhoneAccount);
+                mContext.startService(serviceIntent);
                 break;
             case OmtpConstants.GREETINGS_UPDATE:
                 // Not implemented in V1
@@ -112,29 +113,27 @@
         }
     }
 
-    private void updateAccount(StatusMessage message) {
-        OmtpVvmSyncAccountManager vvmAccountSyncManager =
-                OmtpVvmSyncAccountManager.getInstance(mContext);
-        Account account = new Account(mPhoneAccount.getId(),
-                OmtpVvmSyncAccountManager.ACCOUNT_TYPE);
-
-        if (!vvmAccountSyncManager.isAccountRegistered(account)) {
-            // If the account has not been previously registered, it means that this STATUS sms
-            // is a result of the ACTIVATE sms, so register the voicemail source.
-            vvmAccountSyncManager.createSyncAccount(account);
-            VoicemailContract.Status.setStatus(mContext, mPhoneAccount,
-                    VoicemailContract.Status.CONFIGURATION_STATE_OK,
-                    VoicemailContract.Status.DATA_CHANNEL_STATE_OK,
-                    VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_OK);
-
-            Bundle bundle = new Bundle();
-            bundle.putBoolean(OmtpVvmSyncAdapter.SYNC_EXTRAS_DOWNLOAD, true);
-            bundle.putBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, true);
-            ContentResolver.requestSync(account, VoicemailContract.AUTHORITY, bundle);
-        }
+    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.
-        vvmAccountSyncManager.setAccountCredentialsFromStatusMessage(account, message);
+        VisualVoicemailSettingsUtil.setVisualVoicemailCredentialsFromStatusMessage(
+                mContext,
+                mPhoneAccount,
+                message);
+
+        // Add a phone state listener so that changes to the communication channels can be recorded.
+        vvmSourceManager.addPhoneStateListener(mPhoneAccount);
+
+        Intent serviceIntent = new Intent(mContext, OmtpVvmSyncService.class);
+        serviceIntent.setAction(OmtpVvmSyncService.SYNC_FULL_SYNC);
+        serviceIntent.putExtra(OmtpVvmSyncService.EXTRA_PHONE_ACCOUNT, mPhoneAccount);
+        mContext.startService(serviceIntent);
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpMessageSender.java b/src/com/android/phone/vvm/omtp/sms/OmtpMessageSender.java
index 0011ac3..9080292 100644
--- a/src/com/android/phone/vvm/omtp/sms/OmtpMessageSender.java
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpMessageSender.java
@@ -18,7 +18,6 @@
 import android.annotation.Nullable;
 import android.app.PendingIntent;
 import android.telephony.SmsManager;
-import android.text.TextUtils;
 
 import com.android.phone.vvm.omtp.OmtpConstants;
 import com.android.services.telephony.Log;
@@ -34,103 +33,44 @@
  * <p>
  * Provides simple APIs to send different types of mobile originated OMTP SMS to the VVM server.
  */
-public class OmtpMessageSender {
-    private static final String TAG = "OmtpMessageSender";
-    private final SmsManager mSmsManager;
-    private final short mApplicationPort;
-    private final String mDestinationNumber;
-    private final String mClientType;
-    private final String mProtocolVersion;
-    private final String mClientPrefix;
+public abstract class OmtpMessageSender {
+    protected static final String TAG = "OmtpMessageSender";
+    protected short mApplicationPort;
+    protected String mDestinationNumber;
+    protected SmsManager mSmsManager;
 
-    /**
-     * Creates a new instance of OmtpMessageSenderImpl.
-     *
-     * @param smsManager SMS sending library. There is a different SmsManager for each SIM.
-     * @param applicationPort If set to a value > 0 then a binary sms is sent to this port number.
-     *            Otherwise, a standard text SMS is sent.
-     * @param destinationNumber Destination number to be used.
-     * @param clientType The "ct" field to be set in the MO message. This is the value used by the
-     *            VVM server to identify the client. Certain VVM servers require a specific agreed
-     *            value for this field.
-     * @param protocolVersion OMTP protocol version.
-     * @param clientPrefix The client prefix requested to be used by the server in its MT messages.
-     */
     public OmtpMessageSender(SmsManager smsManager, short applicationPort,
-            String destinationNumber, String clientType, String protocolVersion,
-            String clientPrefix) {
+            String destinationNumber) {
         mSmsManager = smsManager;
         mApplicationPort = applicationPort;
         mDestinationNumber = destinationNumber;
-        mClientType = clientType;
-        mProtocolVersion = protocolVersion;
-        mClientPrefix = clientPrefix;
     }
 
-
-    // Activate message:
-    // V1.1: Activate:pv=<value>;ct=<value>
-    // V1.2: Activate:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
-    // V1.3: Activate:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
     /**
      * Sends a request to the VVM server to activate VVM for the current subscriber.
      *
      * @param sentIntent If not NULL this PendingIntent is broadcast when the message is
      *            successfully sent, or failed.
      */
-    public void requestVvmActivation(@Nullable PendingIntent sentIntent) {
-        StringBuilder sb = new StringBuilder().append(OmtpConstants.ACTIVATE_REQUEST);
+    public void requestVvmActivation(@Nullable PendingIntent sentIntent) {}
 
-        appendProtocolVersionAndClientType(sb);
-        if (TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_2) ||
-                TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_3)) {
-            appendApplicationPort(sb);
-            appendClientPrefix(sb);
-        }
-
-        sendSms(sb.toString(), sentIntent);
-    }
-
-    // Deactivate message:
-    // V1.1: Deactivate:pv=<value>;ct=<string>
-    // V1.2: Deactivate:pv=<value>;ct=<string>
-    // V1.3: Deactivate:pv=<value>;ct=<string>
     /**
      * Sends a request to the VVM server to deactivate VVM for the current subscriber.
      *
      * @param sentIntent If not NULL this PendingIntent is broadcast when the message is
      *            successfully sent, or failed.
      */
-    public void requestVvmDeactivation(@Nullable PendingIntent sentIntent) {
-        StringBuilder sb = new StringBuilder().append(OmtpConstants.DEACTIVATE_REQUEST);
-        appendProtocolVersionAndClientType(sb);
+    public void requestVvmDeactivation(@Nullable PendingIntent sentIntent) {}
 
-        sendSms(sb.toString(), sentIntent);
-    }
-
-    // Status message:
-    // V1.1: STATUS
-    // V1.2: STATUS
-    // V1.3: STATUS:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
     /**
      * Send a request to the VVM server to get account status of the current subscriber.
      *
      * @param sentIntent If not NULL this PendingIntent is broadcast when the message is
      *            successfully sent, or failed.
      */
-    public void requestVvmStatus(@Nullable PendingIntent sentIntent) {
-        StringBuilder sb = new StringBuilder().append(OmtpConstants.STATUS_REQUEST);
+    public void requestVvmStatus(@Nullable PendingIntent sentIntent) {}
 
-        if (TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_3)) {
-            appendProtocolVersionAndClientType(sb);
-            appendApplicationPort(sb);
-            appendClientPrefix(sb);
-        }
-
-        sendSms(sb.toString(), sentIntent);
-    }
-
-    private void sendSms(String text, PendingIntent sentIntent) {
+    protected void sendSms(String text, PendingIntent sentIntent) {
         // If application port is set to 0 then send simple text message, else send data message.
         if (mApplicationPort == 0) {
             Log.v(TAG, String.format("Sending TEXT sms '%s' to %s", text, mDestinationNumber));
@@ -150,24 +90,7 @@
         }
     }
 
-    private void appendProtocolVersionAndClientType(StringBuilder sb) {
-        sb.append(OmtpConstants.SMS_PREFIX_SEPARATOR);
-        appendField(sb, OmtpConstants.PROTOCOL_VERSION, mProtocolVersion);
-        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
-        appendField(sb, OmtpConstants.CLIENT_TYPE, mClientType);
-    }
-
-    private void appendApplicationPort(StringBuilder sb) {
-        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
-        appendField(sb, OmtpConstants.APPLICATION_PORT, mApplicationPort);
-    }
-
-    private void appendClientPrefix(StringBuilder sb) {
-        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
-        sb.append(mClientPrefix);
-    }
-
-    private void appendField(StringBuilder sb, String field, Object value) {
+    protected void appendField(StringBuilder sb, String field, Object value) {
         sb.append(field).append(OmtpConstants.SMS_KEY_VALUE_SEPARATOR).append(value);
     }
 }
diff --git a/src/com/android/phone/vvm/omtp/sms/OmtpStandardMessageSender.java b/src/com/android/phone/vvm/omtp/sms/OmtpStandardMessageSender.java
new file mode 100644
index 0000000..05276e1
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sms/OmtpStandardMessageSender.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2015 Google Inc. All Rights Reserved.
+ *
+ * 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.sms;
+
+import android.annotation.Nullable;
+import android.app.PendingIntent;
+import android.telephony.SmsManager;
+import android.text.TextUtils;
+
+import com.android.phone.vvm.omtp.OmtpConstants;
+
+/**
+ * A implementation of the OmtpMessageSender using the standard OMTP sms protocol.
+ */
+public class OmtpStandardMessageSender extends OmtpMessageSender {
+    private final String mClientType;
+    private final String mProtocolVersion;
+    private final String mClientPrefix;
+
+    /**
+     * Creates a new instance of OmtpStandardMessageSender.
+     *
+     * @param smsManager SMS sending library. There is a different SmsManager for each SIM.
+     * @param applicationPort If set to a value > 0 then a binary sms is sent to this port number.
+     *            Otherwise, a standard text SMS is sent.
+     * @param destinationNumber Destination number to be used.
+     * @param clientType The "ct" field to be set in the MO message. This is the value used by the
+     *            VVM server to identify the client. Certain VVM servers require a specific agreed
+     *            value for this field.
+     * @param protocolVersion OMTP protocol version.
+     * @param clientPrefix The client prefix requested to be used by the server in its MT messages.
+     */
+    public OmtpStandardMessageSender(SmsManager smsManager, short applicationPort,
+            String destinationNumber, String clientType, String protocolVersion,
+            String clientPrefix) {
+        super(smsManager, applicationPort, destinationNumber);
+        mClientType = clientType;
+        mProtocolVersion = protocolVersion;
+        mClientPrefix = clientPrefix;
+    }
+
+    // Activate message:
+    // V1.1: Activate:pv=<value>;ct=<value>
+    // V1.2: Activate:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
+    // V1.3: Activate:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
+    @Override
+    public void requestVvmActivation(@Nullable PendingIntent sentIntent) {
+        StringBuilder sb = new StringBuilder().append(OmtpConstants.ACTIVATE_REQUEST);
+
+        appendProtocolVersionAndClientType(sb);
+        if (TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_2) ||
+                TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_3)) {
+            appendApplicationPort(sb);
+            appendClientPrefix(sb);
+        }
+
+        sendSms(sb.toString(), sentIntent);
+    }
+
+    // Deactivate message:
+    // V1.1: Deactivate:pv=<value>;ct=<string>
+    // V1.2: Deactivate:pv=<value>;ct=<string>
+    // V1.3: Deactivate:pv=<value>;ct=<string>
+    @Override
+    public void requestVvmDeactivation(@Nullable PendingIntent sentIntent) {
+        StringBuilder sb = new StringBuilder().append(OmtpConstants.DEACTIVATE_REQUEST);
+        appendProtocolVersionAndClientType(sb);
+
+        sendSms(sb.toString(), sentIntent);
+    }
+
+    // Status message:
+    // V1.1: STATUS
+    // V1.2: STATUS
+    // V1.3: STATUS:pv=<value>;ct=<value>;pt=<value>;<Clientprefix>
+    @Override
+    public void requestVvmStatus(@Nullable PendingIntent sentIntent) {
+        StringBuilder sb = new StringBuilder().append(OmtpConstants.STATUS_REQUEST);
+
+        if (TextUtils.equals(mProtocolVersion, OmtpConstants.PROTOCOL_VERSION1_3)) {
+            appendProtocolVersionAndClientType(sb);
+            appendApplicationPort(sb);
+            appendClientPrefix(sb);
+        }
+
+        sendSms(sb.toString(), sentIntent);
+    }
+
+    private void appendProtocolVersionAndClientType(StringBuilder sb) {
+        sb.append(OmtpConstants.SMS_PREFIX_SEPARATOR);
+        appendField(sb, OmtpConstants.PROTOCOL_VERSION, mProtocolVersion);
+        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
+        appendField(sb, OmtpConstants.CLIENT_TYPE, mClientType);
+    }
+
+    private void appendApplicationPort(StringBuilder sb) {
+        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
+        appendField(sb, OmtpConstants.APPLICATION_PORT, mApplicationPort);
+    }
+
+    private void appendClientPrefix(StringBuilder sb) {
+        sb.append(OmtpConstants.SMS_FIELD_SEPARATOR);
+        sb.append(mClientPrefix);
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSourceManager.java b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSourceManager.java
new file mode 100644
index 0000000..e7a189d
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSourceManager.java
@@ -0,0 +1,140 @@
+/*
+ * 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.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import com.android.internal.telephony.Phone;
+import com.android.phone.PhoneUtils;
+import com.android.phone.settings.VisualVoicemailSettingsUtil;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * A singleton class designed to remember the active OMTP visual voicemail sources. Because a
+ * voicemail source is tied 1:1 to a phone account, the phone account handle is used as the key
+ * for each voicemail source and the associated data.
+ */
+public class OmtpVvmSourceManager {
+    public static final String TAG = "OmtpVvmSourceManager";
+
+    private static OmtpVvmSourceManager sInstance = new OmtpVvmSourceManager();
+
+    private Context mContext;
+    private SubscriptionManager mSubscriptionManager;
+    private TelephonyManager mTelephonyManager;
+    // Each phone account is associated with a phone state listener for updates to whether the
+    // device is able to sync.
+    private Map<PhoneAccountHandle, PhoneStateListener> mPhoneStateListenerMap;
+
+    /**
+     * Private constructor. Instance should only be acquired through getInstance().
+     */
+    private OmtpVvmSourceManager() {}
+
+    public static OmtpVvmSourceManager getInstance(Context context) {
+        sInstance.setup(context);
+        return sInstance;
+    }
+
+    /**
+     * Set the context and system services so they do not need to be retrieved every time.
+     * @param context The context to get the subscription and telephony manager for.
+     */
+    private void setup(Context context) {
+        if (mContext == null) {
+            mContext = context;
+            mSubscriptionManager = SubscriptionManager.from(context);
+            mTelephonyManager = (TelephonyManager)
+                    mContext.getSystemService(Context.TELEPHONY_SERVICE);
+            mPhoneStateListenerMap = new HashMap<PhoneAccountHandle, PhoneStateListener>();
+        }
+    }
+
+    /**
+     * 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) {
+            if (!PhoneUtils.isPhoneAccountActive(mSubscriptionManager, phoneAccount)) {
+                removeSource(phoneAccount);
+            }
+        }
+    }
+
+    public void removeSource(Phone phone) {
+        removeSource(PhoneUtils.makePstnPhoneAccountHandle(phone));
+    }
+
+    public void removeSource(PhoneAccountHandle phoneAccount) {
+        VoicemailContract.Status.setStatus(mContext, phoneAccount,
+                VoicemailContract.Status.CONFIGURATION_STATE_NOT_CONFIGURED,
+                VoicemailContract.Status.DATA_CHANNEL_STATE_NO_CONNECTION,
+                VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION);
+        removePhoneStateListener(phoneAccount);
+        VisualVoicemailSettingsUtil.setVisualVoicemailEnabled(mContext, phoneAccount, false);
+    }
+
+    public void addPhoneStateListener(PhoneAccountHandle phoneAccount) {
+        if (!mPhoneStateListenerMap.containsKey(phoneAccount)) {
+            VvmPhoneStateListener phoneStateListener = new VvmPhoneStateListener(mContext,
+                    PhoneUtils.makePstnPhoneAccountHandle(phoneAccount.getId()));
+            mPhoneStateListenerMap.put(phoneAccount, phoneStateListener);
+            mTelephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
+        }
+    }
+
+    public void removePhoneStateListener(PhoneAccountHandle phoneAccount) {
+        PhoneStateListener phoneStateListener =
+                mPhoneStateListenerMap.remove(phoneAccount);
+        mTelephonyManager.listen(phoneStateListener, 0);
+    }
+
+    public Set<PhoneAccountHandle> getOmtpVvmSources() {
+        return mPhoneStateListenerMap.keySet();
+    }
+
+    /**
+     * 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.
+     */
+    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;
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncAccountManager.java b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncAccountManager.java
deleted file mode 100644
index 4ac21b4..0000000
--- a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncAccountManager.java
+++ /dev/null
@@ -1,139 +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.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.VoicemailContract;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.SubscriptionManager;
-import android.util.Log;
-
-import com.android.phone.PhoneUtils;
-import com.android.phone.vvm.omtp.OmtpConstants;
-import com.android.phone.vvm.omtp.sms.StatusMessage;
-
-/**
- * A singleton class designed to assist in OMTP visual voicemail sync behavior.
- */
-public class OmtpVvmSyncAccountManager {
-    public static final String TAG = "OmtpVvmSyncAccountManager";
-    // Constants
-    // The authority for the sync adapter's content provider
-    public static final String AUTHORITY = "com.android.voicemail";
-    // An account type, in the form of a domain name
-    public static final String ACCOUNT_TYPE = "com.android.phone.vvm.omtp";
-
-    private static OmtpVvmSyncAccountManager sInstance = new OmtpVvmSyncAccountManager();
-
-    private Context mContext;
-    private SubscriptionManager mSubscriptionManager;
-    private AccountManager mAccountManager;
-
-    /**
-     * Private constructor. Instance should only be acquired through getInstance().
-     */
-    private OmtpVvmSyncAccountManager() {}
-
-    public static OmtpVvmSyncAccountManager getInstance(Context context) {
-        sInstance.setup(context);
-        return sInstance;
-    }
-
-    /**
-     * Set the context and system services so they do not need to be retrieved every time.
-     * @param context The context to get the account manager and subscription manager for.
-     */
-    private void setup(Context context) {
-        if (mContext == null) {
-            mContext = context;
-            mSubscriptionManager = SubscriptionManager.from(context);
-            mAccountManager = AccountManager.get(context);
-        }
-    }
-
-    /**
-     * Register a sync account. There should be a one to one mapping of sync account to voicemail
-     * source. These sync accounts primarily service the purpose of keeping track of how many OMTP
-     * voicemail sources are active and which phone accounts they correspond to.
-     *
-     * @param account The account to register
-     */
-    public void createSyncAccount(Account account) {
-        // Add the account and account type, no password or user data
-        if (mAccountManager.addAccountExplicitly(account, null, null)) {
-             ContentResolver.setIsSyncable(account, AUTHORITY, 1);
-             ContentResolver.setSyncAutomatically(account, AUTHORITY, true);
-        } else {
-            Log.w(TAG, "Attempted to re-register existing account.");
-        }
-    }
-
-    /**
-     * When a voicemail source is removed, we don't always know which one was removed. Check the
-     * list of registered sync accounts against the active subscriptions list and remove the
-     * inactive accounts.
-     */
-    public void removeInactiveAccounts() {
-        Account[] registeredAccounts = mAccountManager.getAccountsByType(ACCOUNT_TYPE);
-        for (int i = 0; i < registeredAccounts.length; i++) {
-            PhoneAccountHandle handle = PhoneUtils.makePstnPhoneAccountHandle(
-                    registeredAccounts[i].name);
-            if (!PhoneUtils.isPhoneAccountActive(mSubscriptionManager, handle)) {
-                mAccountManager.removeAccount(registeredAccounts[i], null, null, null);
-                VoicemailContract.Status.setStatus(mContext, handle,
-                        VoicemailContract.Status.CONFIGURATION_STATE_NOT_CONFIGURED,
-                        VoicemailContract.Status.DATA_CHANNEL_STATE_NO_CONNECTION,
-                        VoicemailContract.Status.NOTIFICATION_CHANNEL_STATE_NO_CONNECTION);
-            }
-        }
-    }
-
-    /**
-     * Check if a certain account is registered.
-     *
-     * @param account The account to look for.
-     * @return {@code true} if the account is in the list of registered OMTP voicemail sync
-     * accounts. {@code false} otherwise.
-     */
-    public boolean isAccountRegistered(Account account) {
-        Account[] accounts = mAccountManager.getAccountsByType(ACCOUNT_TYPE);
-        for (int i = 0; i < accounts.length; i++) {
-            if (account.equals(accounts[i])) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Set the IMAP credentials as extra fields in the account.
-     *
-     * @param account The account to add credentials to.
-     * @param message The status message to extract the fields from.
-     */
-    public void setAccountCredentialsFromStatusMessage(Account account, StatusMessage message) {
-        mAccountManager.setUserData(account, OmtpConstants.IMAP_PORT, message.getImapPort());
-        mAccountManager.setUserData(account, OmtpConstants.SERVER_ADDRESS,
-                message.getServerAddress());
-        mAccountManager.setUserData(account, OmtpConstants.IMAP_USER_NAME,
-                message.getImapUserName());
-        mAccountManager.setUserData(account, OmtpConstants.IMAP_PASSWORD,
-                message.getImapPassword());
-    }
-}
diff --git a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncService.java b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncService.java
index 2fbeaab..59f5120 100644
--- a/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncService.java
+++ b/src/com/android/phone/vvm/omtp/sync/OmtpVvmSyncService.java
@@ -13,136 +13,209 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-
-/**
- * A {@link Service} which runs the internal implementation of {@link AbstractThreadedSyncAdapter},
- * syncing voicemails to and from a visual voicemail server.
- */
-
 package com.android.phone.vvm.omtp.sync;
 
-import android.accounts.Account;
-import android.app.Service;
-import android.content.AbstractThreadedSyncAdapter;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
+import android.app.IntentService;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SyncResult;
-import android.os.Bundle;
-import android.os.IBinder;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
 import android.provider.VoicemailContract;
+import android.telecom.PhoneAccountHandle;
 import android.telecom.Voicemail;
+import android.util.Log;
 
+import com.android.phone.PhoneUtils;
+import com.android.phone.settings.VisualVoicemailSettingsUtil;
 import com.android.phone.vvm.omtp.imap.ImapHelper;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
- * A service to run the VvmSyncAdapter.
+ * Sync OMTP visual voicemail.
  */
-public class OmtpVvmSyncService extends Service {
-    // Storage for an instance of the sync adapter
-    private static OmtpVvmSyncAdapter sSyncAdapter = null;
-    // Object to use as a thread-safe lock
-    private static final Object sSyncAdapterLock = new Object();
+public class OmtpVvmSyncService extends IntentService {
+    private static final String TAG = OmtpVvmSyncService.class.getSimpleName();
+
+    /** Signifies a sync with both uploading to the server and downloading from the server. */
+    public static final String SYNC_FULL_SYNC = "full_sync";
+    /** Only upload to the server. */
+    public static final String SYNC_UPLOAD_ONLY = "upload_only";
+    /** Only download from the server. */
+    public static final String SYNC_DOWNLOAD_ONLY = "download_only";
+    /** The account to sync. */
+    public static final String EXTRA_PHONE_ACCOUNT = "phone_account";
+
+    // Timeout used to call ConnectivityManager.requestNetwork
+    private static final int NETWORK_REQUEST_TIMEOUT_MILLIS = 60 * 1000;
+
+    private VoicemailsQueryHelper mQueryHelper;
+
+    private ConnectivityManager mConnectivityManager;
+
+    public OmtpVvmSyncService() {
+        super("OmtpVvmSyncService");
+    }
 
     @Override
     public void onCreate() {
-        synchronized (sSyncAdapterLock) {
-            if (sSyncAdapter == null) {
-                sSyncAdapter = new OmtpVvmSyncAdapter(getApplicationContext(), true);
-            }
-        }
+        super.onCreate();
+        mQueryHelper = new VoicemailsQueryHelper(this);
     }
 
     @Override
-    public IBinder onBind(Intent intent) {
-        return sSyncAdapter.getSyncAdapterBinder();
+    protected void onHandleIntent(Intent intent) {
+        if (intent == null) {
+            Log.d(TAG, "onHandleIntent: could not handle null intent");
+            return;
+        }
+
+        String action = intent.getAction();
+        PhoneAccountHandle phoneAccount = intent.getParcelableExtra(EXTRA_PHONE_ACCOUNT);
+        if (phoneAccount != null) {
+            Log.v(TAG, "Sync requested: " + action + " - for account: " + phoneAccount);
+            doSync(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);
+            }
+        }
     }
 
-    public class OmtpVvmSyncAdapter extends AbstractThreadedSyncAdapter {
-        /**
-         * Sync triggers should pass this extra to clear the database and freshly populate from the
-         * server.
-         */
-        public static final String SYNC_EXTRAS_DOWNLOAD = "extra_download";
+    private void doSync(PhoneAccountHandle phoneAccount, String action) {
+        if (!VisualVoicemailSettingsUtil.isVisualVoicemailEnabled(this, phoneAccount)) {
+            Log.v(TAG, "Sync requested for disabled account");
+            return;
+        }
 
-        private Context mContext;
+        int subId = PhoneUtils.getSubIdForPhoneAccountHandle(phoneAccount);
 
-        public OmtpVvmSyncAdapter(Context context, boolean autoInitialize) {
-            super(context, autoInitialize);
+        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);
+    }
+
+    private class OmtpVvmNetworkRequestCallback extends ConnectivityManager.NetworkCallback {
+        Context mContext;
+        PhoneAccountHandle mPhoneAccount;
+        String mAction;
+
+        public OmtpVvmNetworkRequestCallback(Context context, PhoneAccountHandle phoneAccount,
+                String action) {
             mContext = context;
+            mPhoneAccount = phoneAccount;
+            mAction = action;
         }
 
         @Override
-        public void onPerformSync(Account account, Bundle extras, String authority,
-                ContentProviderClient provider, SyncResult syncResult) {
-            ImapHelper imapHelper = new ImapHelper(mContext, account);
-            VoicemailsQueryHelper queryHelper = new VoicemailsQueryHelper(mContext);
-
-            if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD, false)) {
-                List<Voicemail> readVoicemails = queryHelper.getReadVoicemails();
-                List<Voicemail> deletedVoicemails = queryHelper.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.
-                    queryHelper.deleteFromDatabase(deletedVoicemails);
-                }
-
-                if (readVoicemails != null && imapHelper.markMessagesAsRead(readVoicemails)) {
-                    queryHelper.markReadInDatabase(readVoicemails);
-                }
+        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);
             }
+            if (SYNC_FULL_SYNC.equals(mAction) || SYNC_DOWNLOAD_ONLY.equals(mAction)) {
+                download(imapHelper);
+            }
+            releaseNetwork();
+        }
 
-            if (extras.getBoolean(SYNC_EXTRAS_DOWNLOAD, false)) {
-                List<Voicemail> serverVoicemails = imapHelper.fetchAllVoicemails();
-                List<Voicemail> localVoicemails = queryHelper.getAllVoicemails();
+        @Override
+        public void onLost(Network network) {
+            releaseNetwork();
+        }
 
-                if (localVoicemails == null || serverVoicemails == null) {
-                    // Null value means the query failed.
-                    return;
-                }
+        @Override
+        public void onUnavailable() {
+            releaseNetwork();
+        }
 
-                Map<String, Voicemail> remoteMap = buildMap(serverVoicemails);
+        private void releaseNetwork() {
+            getConnectivityManager().unregisterNetworkCallback(this);
+        }
+    }
 
-                // Go through all the local voicemails and check if they are on the server.
-                // They may be read or deleted on the server but not locally. Perform the
-                // appropriate local operation if the status differs from the server. Remove
-                // the messages that exist both locally and on the server to know which server
-                // messages to insert locally.
-                for (int i = 0; i < localVoicemails.size(); i++) {
-                    Voicemail localVoicemail = localVoicemails.get(i);
-                    Voicemail remoteVoicemail = remoteMap.remove(localVoicemail.getSourceData());
-                    if (remoteVoicemail == null) {
-                        queryHelper.deleteFromDatabase(localVoicemail);
-                    } else {
-                        if (remoteVoicemail.isRead() != localVoicemail.isRead()) {
-                            queryHelper.markReadInDatabase(localVoicemail);
-                        }
-                    }
-                }
+    private ConnectivityManager getConnectivityManager() {
+        if (mConnectivityManager == null) {
+            mConnectivityManager = (ConnectivityManager) this.getSystemService(
+                    Context.CONNECTIVITY_SERVICE);
+        }
+        return mConnectivityManager;
+    }
 
-                // The leftover messages are messages that exist on the server but not locally.
-                for (Voicemail remoteVoicemail : remoteMap.values()) {
-                    VoicemailContract.Voicemails.insert(mContext, remoteVoicemail);
+    private void 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);
+        }
+
+        if (readVoicemails != null && imapHelper.markMessagesAsRead(readVoicemails)) {
+            mQueryHelper.markReadInDatabase(readVoicemails);
+        }
+    }
+
+    private void 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;
+        }
+
+        Map<String, Voicemail> remoteMap = buildMap(serverVoicemails);
+
+        // Go through all the local voicemails and check if they are on the server.
+        // They may be read or deleted on the server but not locally. Perform the
+        // appropriate local operation if the status differs from the server. Remove
+        // the messages that exist both locally and on the server to know which server
+        // messages to insert locally.
+        for (int i = 0; i < localVoicemails.size(); i++) {
+            Voicemail localVoicemail = localVoicemails.get(i);
+            Voicemail remoteVoicemail = remoteMap.remove(localVoicemail.getSourceData());
+            if (remoteVoicemail == null) {
+                mQueryHelper.deleteFromDatabase(localVoicemail);
+            } else {
+                if (remoteVoicemail.isRead() != localVoicemail.isRead()) {
+                    mQueryHelper.markReadInDatabase(localVoicemail);
                 }
             }
         }
 
-        /**
-         * Builds a map from provider data to message for the given collection of voicemails.
-         */
-        private Map<String, Voicemail> buildMap(List<Voicemail> messages) {
-            Map<String, Voicemail> map = new HashMap<String, Voicemail>();
-            for (Voicemail message : messages) {
-                map.put(message.getSourceData(), message);
-            }
-            return map;
+        // The leftover messages are messages that exist on the server but not locally.
+        for (Voicemail remoteVoicemail : remoteMap.values()) {
+            VoicemailContract.Voicemails.insert(this, remoteVoicemail);
         }
     }
+
+    /**
+     * Builds a map from provider data to message for the given collection of voicemails.
+     */
+    private Map<String, Voicemail> buildMap(List<Voicemail> messages) {
+        Map<String, Voicemail> map = new HashMap<String, Voicemail>();
+        for (Voicemail message : messages) {
+            map.put(message.getSourceData(), message);
+        }
+        return map;
+    }
 }
diff --git a/src/com/android/phone/vvm/omtp/sync/VoicemailProviderChangeReceiver.java b/src/com/android/phone/vvm/omtp/sync/VoicemailProviderChangeReceiver.java
new file mode 100644
index 0000000..0885d65
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sync/VoicemailProviderChangeReceiver.java
@@ -0,0 +1,38 @@
+/*
+ * 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.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.VoicemailContract;
+
+/**
+ * Receives changes to the voicemail provider so they can be sent to the voicemail server.
+ */
+public class VoicemailProviderChangeReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        boolean isSelfChanged = intent.getBooleanExtra(VoicemailContract.EXTRA_SELF_CHANGE, false);
+        OmtpVvmSourceManager vvmSourceManager =
+                OmtpVvmSourceManager.getInstance(context);
+        if (vvmSourceManager.getOmtpVvmSources().size() > 0 && !isSelfChanged) {
+            Intent serviceIntent = new Intent(context, OmtpVvmSyncService.class);
+            serviceIntent.setAction(OmtpVvmSyncService.SYNC_UPLOAD_ONLY);
+            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
new file mode 100644
index 0000000..fa87a59
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sync/VoicemailStatusQueryHelper.java
@@ -0,0 +1,88 @@
+/*
+ * 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.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+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
+   };
+
+    public static final int _ID = 0;
+    public static final int NOTIFICATION_CHANNEL_STATE = 1;
+    public static final int SOURCE_PACKAGE = 2;
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private Uri mSourceUri;
+
+    public VoicemailStatusQueryHelper(Context context) {
+        mContext = context;
+        mContentResolver = context.getContentResolver();
+        mSourceUri = VoicemailContract.Status.buildSourceUri(mContext.getPackageName());
+    }
+
+    /**
+     * 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) {
+        Cursor cursor = null;
+        if (phoneAccount != null) {
+            String phoneAccountComponentName = phoneAccount.getComponentName().flattenToString();
+            String phoneAccountId = phoneAccount.getId();
+            if (phoneAccountComponentName == null || phoneAccountId == null) {
+                return false;
+            }
+            try {
+                String whereClause =
+                        Status.PHONE_ACCOUNT_COMPONENT_NAME + "=? AND " +
+                        Status.PHONE_ACCOUNT_ID + "=? AND " + Status.SOURCE_PACKAGE + "=?";
+                String[] whereArgs = { phoneAccountComponentName, phoneAccountId,
+                        mContext.getPackageName()};
+                cursor = mContentResolver.query(
+                        mSourceUri, PROJECTION, whereClause, whereArgs, null);
+                if (cursor != null && cursor.moveToFirst()) {
+                    return cursor.getInt(NOTIFICATION_CHANNEL_STATE) ==
+                            Status.NOTIFICATION_CHANNEL_STATE_OK;
+                }
+            }
+            finally {
+                if (cursor != null) {
+                    cursor.close();
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/phone/vvm/omtp/sync/VoicemailsQueryHelper.java b/src/com/android/phone/vvm/omtp/sync/VoicemailsQueryHelper.java
index f844e36..f45adf7 100644
--- a/src/com/android/phone/vvm/omtp/sync/VoicemailsQueryHelper.java
+++ b/src/com/android/phone/vvm/omtp/sync/VoicemailsQueryHelper.java
@@ -31,7 +31,7 @@
 import java.util.List;
 
 /**
- * Construct a queries to interact with the voicemails table.
+ * Construct queries to interact with the voicemails table.
  */
 public class VoicemailsQueryHelper {
     private static final String TAG = "VoicemailsQueryHelper";
@@ -102,8 +102,8 @@
         try {
             List<Voicemail> voicemails = new ArrayList<Voicemail>();
             while (cursor.moveToNext()) {
-                final long id = cursor.getLong(VoicemailsQueryHelper._ID);
-                final String sourceData = cursor.getString(VoicemailsQueryHelper.SOURCE_DATA);
+                final long id = cursor.getLong(_ID);
+                final String sourceData = cursor.getString(SOURCE_DATA);
                 Voicemail voicemail = Voicemail.createForUpdate(id, sourceData).build();
                 voicemails.add(voicemail);
             }
diff --git a/src/com/android/phone/vvm/omtp/sync/VvmPhoneStateListener.java b/src/com/android/phone/vvm/omtp/sync/VvmPhoneStateListener.java
new file mode 100644
index 0000000..c7c1116
--- /dev/null
+++ b/src/com/android/phone/vvm/omtp/sync/VvmPhoneStateListener.java
@@ -0,0 +1,52 @@
+/*
+ * 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/CdmaConference.java b/src/com/android/services/telephony/CdmaConference.java
index 36eacea..5926a9f 100755
--- a/src/com/android/services/telephony/CdmaConference.java
+++ b/src/com/android/services/telephony/CdmaConference.java
@@ -171,7 +171,8 @@
                     Context.CARRIER_CONFIG_SERVICE);
             PersistableBundle b = configManager.getConfig();
             if (b != null) {
-                supportSwapAfterMerge = b.getBoolean(CarrierConfigManager.BOOL_SUPPORT_SWAP_AFTER_MERGE);
+                supportSwapAfterMerge =
+                        b.getBoolean(CarrierConfigManager.KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL);
                 Log.d(this, "Current network support swap after call merged capability is "
                         + supportSwapAfterMerge);
             }
diff --git a/src/com/android/services/telephony/ConferenceParticipantConnection.java b/src/com/android/services/telephony/ConferenceParticipantConnection.java
index eae3696..c142cc3 100644
--- a/src/com/android/services/telephony/ConferenceParticipantConnection.java
+++ b/src/com/android/services/telephony/ConferenceParticipantConnection.java
@@ -29,6 +29,11 @@
 public class ConferenceParticipantConnection extends Connection {
 
     /**
+     * The user entity URI For the conference participant.
+     */
+    private final Uri mUserEntity;
+
+    /**
      * The endpoint URI For the conference participant.
      */
     private final Uri mEndpoint;
@@ -51,6 +56,7 @@
         setAddress(participant.getHandle(), PhoneConstants.PRESENTATION_ALLOWED);
         setCallerDisplayName(participant.getDisplayName(), PhoneConstants.PRESENTATION_ALLOWED);
 
+        mUserEntity = participant.getHandle();
         mEndpoint = participant.getEndpoint();
         setCapabilities();
     }
@@ -102,7 +108,16 @@
      */
     @Override
     public void onDisconnect() {
-        mParentConnection.onDisconnectConferenceParticipant(mEndpoint);
+        mParentConnection.onDisconnectConferenceParticipant(mUserEntity);
+    }
+
+    /**
+     * Retrieves the user handle for this connection.
+     *
+     * @return The userEntity.
+     */
+    public Uri getUserEntity() {
+        return mUserEntity;
     }
 
     /**
diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 682326f..38cb4a3 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -16,11 +16,9 @@
 
 package com.android.services.telephony;
 
-import android.content.ComponentName;
 import android.content.Context;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
-import android.telecom.Conference.Listener;
 import android.telecom.Conference;
 import android.telecom.ConferenceParticipant;
 import android.telecom.Connection.VideoProvider;
@@ -147,7 +145,7 @@
         public void onConferenceParticipantsChanged(android.telecom.Connection c,
                 List<ConferenceParticipant> participants) {
 
-            if (c == null) {
+            if (c == null || participants == null) {
                 return;
             }
             Log.v(this, "onConferenceParticipantsChanged: %d participants", participants.size());
@@ -203,6 +201,16 @@
             mConferenceParticipantConnections =
                     new ConcurrentHashMap<Uri, ConferenceParticipantConnection>(8, 0.9f, 1);
 
+    public void updateConferenceParticipantsAfterCreation() {
+        if (mConferenceHost != null) {
+            Log.v(this, "updateConferenceStateAfterCreation :: process participant update");
+            handleConferenceParticipantsUpdate(mConferenceHost,
+                    mConferenceHost.getConferenceParticipants());
+        } else {
+            Log.v(this, "updateConferenceStateAfterCreation :: null mConferenceHost");
+        }
+    }
+
     /**
      * Initializes a new {@link ImsConference}.
      *
@@ -293,7 +301,7 @@
         if (mConferenceHost != null) {
             return mConferenceHost.getVideoState();
         }
-        return VideoProfile.VideoState.AUDIO_ONLY;
+        return VideoProfile.STATE_AUDIO_ONLY;
     }
 
     /**
@@ -487,22 +495,26 @@
     private void handleConferenceParticipantsUpdate(
             TelephonyConnection parent, List<ConferenceParticipant> participants) {
 
+        if (participants == null) {
+            return;
+        }
         boolean newParticipantsAdded = false;
         boolean oldParticipantsRemoved = false;
         ArrayList<ConferenceParticipant> newParticipants = new ArrayList<>(participants.size());
-        HashSet<Uri> participantEndpoints = new HashSet<>(participants.size());
+        HashSet<Uri> participantUserEntities = new HashSet<>(participants.size());
 
         // Add any new participants and update existing.
         for (ConferenceParticipant participant : participants) {
-            Uri endpoint = participant.getEndpoint();
-            participantEndpoints.add(endpoint);
-            if (!mConferenceParticipantConnections.containsKey(endpoint)) {
+            Uri userEntity = participant.getHandle();
+
+            participantUserEntities.add(userEntity);
+            if (!mConferenceParticipantConnections.containsKey(userEntity)) {
                 createConferenceParticipantConnection(parent, participant);
                 newParticipants.add(participant);
                 newParticipantsAdded = true;
             } else {
                 ConferenceParticipantConnection connection =
-                        mConferenceParticipantConnections.get(endpoint);
+                        mConferenceParticipantConnections.get(userEntity);
                 connection.updateState(participant.getState());
             }
         }
@@ -512,7 +524,7 @@
             // Set the state of the new participants at once and add to the conference
             for (ConferenceParticipant newParticipant : newParticipants) {
                 ConferenceParticipantConnection connection =
-                        mConferenceParticipantConnections.get(newParticipant.getEndpoint());
+                        mConferenceParticipantConnections.get(newParticipant.getHandle());
                 connection.updateState(newParticipant.getState());
             }
         }
@@ -524,9 +536,11 @@
         while (entryIterator.hasNext()) {
             Map.Entry<Uri, ConferenceParticipantConnection> entry = entryIterator.next();
 
-            if (!participantEndpoints.contains(entry.getKey())) {
+            if (!participantUserEntities.contains(entry.getKey())) {
                 ConferenceParticipantConnection participant = entry.getValue();
+                participant.setDisconnected(new DisconnectCause(DisconnectCause.CANCELED));
                 participant.removeConnectionListener(mParticipantListener);
+                mTelephonyConnectionService.removeConnection(participant);
                 removeConnection(participant);
                 entryIterator.remove();
                 oldParticipantsRemoved = true;
@@ -563,7 +577,7 @@
             Log.v(this, "createConferenceParticipantConnection: %s", connection);
         }
 
-        mConferenceParticipantConnections.put(participant.getEndpoint(), connection);
+        mConferenceParticipantConnections.put(participant.getHandle(), connection);
         PhoneAccountHandle phoneAccountHandle =
                 PhoneUtils.makePstnPhoneAccountHandle(parent.getPhone());
         mTelephonyConnectionService.addExistingConnection(phoneAccountHandle, connection);
@@ -576,12 +590,10 @@
      * @param participant The participant to remove.
      */
     private void removeConferenceParticipant(ConferenceParticipantConnection participant) {
-        if (Log.VERBOSE) {
-            Log.v(this, "removeConferenceParticipant: %s", participant);
-        }
+        Log.d(this, "removeConferenceParticipant: %s", participant);
 
         participant.removeConnectionListener(mParticipantListener);
-        mConferenceParticipantConnections.remove(participant.getEndpoint());
+        mConferenceParticipantConnections.remove(participant.getUserEntity());
     }
 
     /**
@@ -597,6 +609,7 @@
             // Mark disconnect cause as cancelled to ensure that the call is not logged in the
             // call log.
             connection.setDisconnected(new DisconnectCause(DisconnectCause.CANCELED));
+            mTelephonyConnectionService.removeConnection(connection);
             connection.destroy();
         }
         mConferenceParticipantConnections.clear();
@@ -651,9 +664,11 @@
             case Connection.STATE_INITIALIZING:
             case Connection.STATE_NEW:
             case Connection.STATE_RINGING:
-            case Connection.STATE_DIALING:
                 // No-op -- not applicable.
                 break;
+            case Connection.STATE_DIALING:
+                setDialing();
+                break;
             case Connection.STATE_DISCONNECTED:
                 DisconnectCause disconnectCause;
                 if (mConferenceHost == null) {
diff --git a/src/com/android/services/telephony/ImsConferenceController.java b/src/com/android/services/telephony/ImsConferenceController.java
index b266b81..f445dcb 100644
--- a/src/com/android/services/telephony/ImsConferenceController.java
+++ b/src/com/android/services/telephony/ImsConferenceController.java
@@ -318,8 +318,9 @@
         // Create conference and add to telecom
         ImsConference conference = new ImsConference(mConnectionService, conferenceHostConnection);
         conference.setState(connection.getState());
-        mConnectionService.addConference(conference);
         conference.addListener(mConferenceListener);
+        conference.updateConferenceParticipantsAfterCreation();
+        mConnectionService.addConference(conference);
 
         // Cleanup TelephonyConnection which backed the original connection and remove from telecom.
         // Use the "Other" disconnect cause to ensure the call is logged to the call log but the
diff --git a/src/com/android/services/telephony/TelecomAccountRegistry.java b/src/com/android/services/telephony/TelecomAccountRegistry.java
index 6e9d522..4b5096b 100644
--- a/src/com/android/services/telephony/TelecomAccountRegistry.java
+++ b/src/com/android/services/telephony/TelecomAccountRegistry.java
@@ -19,8 +19,12 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.telecom.PhoneAccount;
@@ -53,7 +57,7 @@
 
     // This icon is the one that is used when the Slot ID that we have for a particular SIM
     // is not supported, i.e. SubscriptionManager.INVALID_SLOT_ID or the 5th SIM in a phone.
-    private final static int defaultPhoneAccountIcon =  R.drawable.ic_multi_sim;
+    private final static int DEFAULT_SIM_ICON =  R.drawable.ic_multi_sim;
 
     final class AccountEntry implements PstnPhoneCapabilitiesNotifier.Listener {
         private final Phone mPhone;
@@ -104,7 +108,7 @@
 
             String label;
             String description;
-            Bitmap iconBitmap = null;
+            Icon icon = null;
 
             // We can only get the real slotId from the SubInfoRecord, we can't calculate the
             // slotId from the subId or the phoneId in all instances.
@@ -126,7 +130,7 @@
                     subDisplayName = record.getDisplayName();
                     slotId = record.getSimSlotIndex();
                     color = record.getIconTint();
-                    iconBitmap = record.createIconBitmap(mContext);
+                    icon = Icon.createWithBitmap(record.createIconBitmap(mContext));
                 }
 
                 String slotIdString;
@@ -164,10 +168,21 @@
                 updateVideoPauseSupport(record);
             }
 
-            if (iconBitmap == null) {
-                iconBitmap = BitmapFactory.decodeResource(
-                        mContext.getResources(),
-                        defaultPhoneAccountIcon);
+            if (icon == null) {
+                // TODO: Switch to using Icon.createWithResource() once that supports tinting.
+                Resources res = mContext.getResources();
+                Drawable drawable = res.getDrawable(DEFAULT_SIM_ICON, null);
+                drawable.setTint(res.getColor(R.color.default_sim_icon_tint_color, null));
+                drawable.setTintMode(PorterDuff.Mode.SRC_ATOP);
+
+                int width = drawable.getIntrinsicWidth();
+                int height = drawable.getIntrinsicHeight();
+                Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+                Canvas canvas = new Canvas(bitmap);
+                drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+                drawable.draw(canvas);
+
+                icon = Icon.createWithBitmap(bitmap);
             }
 
             PhoneAccount account = PhoneAccount.builder(phoneAccountHandle, label)
@@ -175,7 +190,7 @@
                     .setSubscriptionAddress(
                             Uri.fromParts(PhoneAccount.SCHEME_TEL, subNumber, null))
                     .setCapabilities(capabilities)
-                    .setIcon(iconBitmap == null ? null : Icon.createWithBitmap(iconBitmap))
+                    .setIcon(icon)
                     .setHighlightColor(color)
                     .setShortDescription(description)
                     .setSupportedUriSchemes(Arrays.asList(
diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index fa3c506..a52418c 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -74,6 +74,7 @@
                         Log.d(TelephonyConnection.this, "SettingOriginalConnection " +
                                 mOriginalConnection.toString() + " with " + connection.toString());
                         setOriginalConnection(connection);
+                        mWasImsConnection = false;
                     }
                     break;
                 case MSG_RINGBACK_TONE:
@@ -271,7 +272,7 @@
 
     /**
      * For video calls, indicates whether the outgoing video for the call can be paused using
-     * the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.
+     * the {@link android.telecom.VideoProfile#STATE_PAUSED} VideoState.
      */
     private boolean mIsVideoPauseSupported;
 
@@ -657,6 +658,18 @@
         return null;
     }
 
+     /**
+     * Checks for and returns the list of conference participants
+     * associated with this connection.
+     */
+    public List<ConferenceParticipant> getConferenceParticipants() {
+        if (mOriginalConnection == null) {
+            Log.v(this, "Null mOriginalConnection, cannot get conf participants.");
+            return null;
+        }
+        return mOriginalConnection.getConferenceParticipants();
+    }
+
     /**
      * Checks to see the original connection corresponds to an active incoming call. Returns false
      * if there is no such actual call, or if the associated call is not incoming (See
@@ -911,7 +924,7 @@
 
     /**
      * For video calls, sets whether this connection supports pausing the outgoing video for the
-     * call using the {@link android.telecom.VideoProfile.VideoState#PAUSED} VideoState.
+     * call using the {@link android.telecom.VideoProfile#STATE_PAUSED} VideoState.
      *
      * @param isVideoPauseSupported {@code true} if pause state supported, {@code false} otherwise.
      */